Merge Tool

EGit now supports a visual merge tool to better support resolving conflicts detected during merge, rebase or cherry-pick