Retrieve all fixes from the EGit team in the MergeEditorInput

This also better isolates EMF Compare specific code so that merging
future fixes from EGit is easier.

Change-Id: I1a4f811d95c5bab2315d03a06a5e663c84e101b3
6 files changed