Simple case git merge resolution tool.