tianjianchn/git-mergemate

Tools to help with git merges