From http://www.gitguys.com/topics/merging-with-a-gui/