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 /Documentation/user-manual.conf | |
| parent | git-svn: add -l/--local command to "git svn rebase" (diff) | |
| parent | Add git-mergetool to run an appropriate merge conflict resolution program (diff) | |
| download | tgif-4739cea5668bc398600197d2a4a425119c8dc322.tar.xz | |
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 'Documentation/user-manual.conf')
0 files changed, 0 insertions, 0 deletions