Andrew's git / gitweb.git / diff
?
Merge branch 'master' of git://repo.or.cz/git/mergetool
authorJunio C Hamano <junkio@cox.net>
Wed, 14 Mar 2007 08:13:39 +0000 (01:13 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 14 Mar 2007 08:13:39 +0000 (01:13 -0700)
* 'master' of git://repo.or.cz/git/mergetool:
Add git-mergetool to run an appropriate merge conflict resolution program

Trivial merge