SuccessChanges

Summary

  1. [merge] Enable overlays for DiffNodes (details)
  2. [merge] Internal refactoring: introduce AbstractGitMergeEditorInput (details)
Commit c87fbb9820ddde680881df991368bb76681e4b3a by Thomas Wolf
[merge] Enable overlays for DiffNodes

Set the correct combination of Differencer constants for the kind of
a DiffNode. The framework then displays the correct overlays
automatically, for instance the conflict overlay.

Change-Id: I77a394302a81683b47cb1468557a25846925a8ed
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
The file was modifiedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java
Commit feb745fd38fc605d617c43bf25256b32288d8c6e by Thomas Wolf
[merge] Internal refactoring: introduce AbstractGitMergeEditorInput

Factor out things that are not directly related to building the merge
diff nodes into a new abstract superclass. This will make it easier to
generalize the merge tool and re-use parts for other comparisons.

Change-Id: Ic1c38622bfee7fcb6c8ba80b257c23986951975c
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
The file was modifiedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java
The file was addedorg.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/AbstractGitMergeEditorInput.java