DESCRIPTION

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: Carlie Harper xxx@xxx.xxx

COMMENTS

author: Brenden Conley
date: 2012-11-02 13:48:20.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/sandbox/job/egit.gerrit/3527/ 

-------------------------------------
author: Brenden Conley
date: 2012-11-02 14:20:12.000000000

Patch Set 1: Fails

Build Failed 

https://hudson.eclipse.org/sandbox/job/egit.gerrit/3527/ : ABORTED

-------------------------------------
author: Danika Greer
date: 2012-11-02 16:10:25.000000000

Patch Set 1: (3 inline comments)

See inline comments. Not tried running it yet.

Line:60, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/CompareWithWorkingTreeHandler.java -> Space missing in `null?`. Same below.

Line:211, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitCompareFileRevisionEditorInput.java -> No null check for ac here?

Line:226, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitCompareFileRevisionEditorInput.java -> No null check for ac here?

-------------------------------------
author: Carlie Harper
date: 2012-11-05 08:22:42.000000000

Patch Set 1: (3 inline comments)



Line:60, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/CompareWithWorkingTreeHandler.java -> Done

Line:211, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitCompareFileRevisionEditorInput.java -> Done

Line:226, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitCompareFileRevisionEditorInput.java -> Done

-------------------------------------
