From: Junio C Hamano Date: Wed, 14 Mar 2007 08:13:39 +0000 (-0700) Subject: Merge branch 'master' of git://repo.or.cz/git/mergetool X-Git-Tag: v1.5.1-rc1~39 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4739cea5668bc398600197d2a4a425119c8dc322;p=git.git Merge branch 'master' of git://repo.or.cz/git/mergetool * 'master' of git://repo.or.cz/git/mergetool: Add git-mergetool to run an appropriate merge conflict resolution program --- 4739cea5668bc398600197d2a4a425119c8dc322