Merge branch 'master' of git://repo.or.cz/git/mergetool
commit4739cea5668bc398600197d2a4a425119c8dc322
authorJunio C Hamano <junkio@cox.net>
Wed, 14 Mar 2007 08:13:39 +0000 (14 01:13 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 14 Mar 2007 08:13:39 +0000 (14 01:13 -0700)
tree9a524615da77dd7cb97dc42afbb28ddbfeeb7ff6
parentdee41f3e5569f9465018535f02d45796d84aebd8
parentc4b4a5af1604a7546c0b0786e47bcff8a47a6039
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