![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 14 Mar 2007 08:13:39 +0000 (01:13 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 14 Mar 2007 08:13:39 +0000 (01:13 -0700) | ||
| commit | 4739cea5668bc398600197d2a4a425119c8dc322 | |
| tree | 9a524615da77dd7cb97dc42afbb28ddbfeeb7ff6 | tree | snapshot |
| parent | dee41f3e5569f9465018535f02d45796d84aebd8 | commit | diff |
| parent | c4b4a5af1604a7546c0b0786e47bcff8a47a6039 | commit | diff |
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
* 'master' of git://repo.or.cz/git/mergetool:
Add git-mergetool to run an appropriate merge conflict resolution program