git-mergetools
A tool to simplify the process of solving conflicts after a git merge, rebase or cherry-pick.