diff options
| author | Stefan Lay | 2012-11-02 13:08:07 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2012-11-11 22:24:20 +0000 |
| commit | c7474651be1aa62ba79011eb5e6cccd62ab17027 (patch) | |
| tree | 8ef13e76919799ac49ebd2998aa6b666109a6841 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties | |
| parent | 7ff95603bf71ef60bab07e410bcf7d1a05217c32 (diff) | |
| download | egit-c7474651be1aa62ba79011eb5e6cccd62ab17027.tar.gz egit-c7474651be1aa62ba79011eb5e6cccd62ab17027.tar.xz egit-c7474651be1aa62ba79011eb5e6cccd62ab17027.zip | |
Use three-way mode of the compare editor
When the user compares versions which are not direct descendants of
each other it is useful to see the content of the common ancestor.
This change introduces the usage of the three-way compare editor.
Three-way compare is still not supported when the user compares folders
or projects. This would have to be implemented in the CompareTreeView.
Change-Id: Ied1fa51d3a1ec9136ec270ff8500e08a32629fce
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties')
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties index dfd5a69351..1a4f6e9d5a 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties @@ -719,6 +719,7 @@ CompareWithIndexAction_errorOnAddToIndex=Error during adding to index CompareWithPreviousActionHandler_MessageRevisionNotFound=No previous revision of {0} could be found in the repository. CompareWithPreviousActionHandler_TaskGeneratingInput=Generating comparison with previous revision CompareWithPreviousActionHandler_TitleRevisionNotFound=Previous revision not found +CompareUtils_errorCommonAncestor=Error finding common ancestor for {0} and {1} ConfirmationPage_cantConnectToAnyTitle=Can't Connect ConfirmationPage_cantConnectToAny=Can''t connect to any URI: {0} |