diff options
| author | Lars Vogel | 2020-09-11 07:08:41 +0000 |
|---|---|---|
| committer | Lars Vogel | 2020-09-11 07:27:38 +0000 |
| commit | 06b5fd88437610982131194133faf0a43c0cf83f (patch) | |
| tree | d343bf75d00790fb38c3ad28ce7e31a7559fa3a8 | |
| parent | 52d621e8094460940edbf11426301e17cdd08592 (diff) | |
| download | eclipse.platform.common-06b5fd88437610982131194133faf0a43c0cf83f.tar.gz eclipse.platform.common-06b5fd88437610982131194133faf0a43c0cf83f.tar.xz eclipse.platform.common-06b5fd88437610982131194133faf0a43c0cf83f.zip | |
Bug 32023 - Dropping a technical name from the help
Change-Id: Ic3716bf8aa4a911b201989e91d201063661fae31
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
| -rw-r--r-- | bundles/org.eclipse.platform.doc.user/reference/ref-25.htm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-25.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-25.htm index 5a1202ae6..5407e5938 100644 --- a/bundles/org.eclipse.platform.doc.user/reference/ref-25.htm +++ b/bundles/org.eclipse.platform.doc.user/reference/ref-25.htm @@ -66,7 +66,7 @@ Workspace synchronization.</p> content viewer available the button is hidden.</dd> <dt>Control Visibility of Ancestor Pane <img src="../images/ancestorpane_co.svg" alt="Image of the 'Control Visibility of Ancestor Pane' button"></dt> <dd>There are two conditions under which a three way compare will occur, - both when using the Team version management support: when comparing + both when using the version management support: when comparing a file that is in conflict, and when comparing a file being merged from a branch. In both cases, the system will determine a common ancestor in the repository to compare the conflict or merge against. |