Git Config merge.tool "your.tool" Git ... Jun 25th, 2010 git config merge.tool your.tool git mergetool http://stackoverflow.com/questions/161813/how-do-i-fix-merge-conflicts-in-git