@matheusbsbs / matheus-bagliano / commits / 4739cea566
Fork 0

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

Junio C Hamano committed Mar 14, 2007 at 01:13 UTC 4739cea5668bc398600197d2a4a425119c8dc322

No changes.