diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-14 01:13:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-14 01:13:39 -0700 |
| commit | 4739cea5668bc398600197d2a4a425119c8dc322 (patch) | |
| tree | 9a524615da77dd7cb97dc42afbb28ddbfeeb7ff6 /perl | |
| parent | dee41f3e5569f9465018535f02d45796d84aebd8 (diff) | |
| parent | c4b4a5af1604a7546c0b0786e47bcff8a47a6039 (diff) | |
| download | git-4739cea5668bc398600197d2a4a425119c8dc322.tar.gz | |
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
Diffstat (limited to 'perl')
0 files changed, 0 insertions, 0 deletions