![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 8 Mar 2008 06:30:07 +0000 (22:30 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 8 Mar 2008 06:30:07 +0000 (22:30 -0800) | ||
| commit | 003b93cfb3f588284b89dc4e4c89e1046913ff59 | |
| tree | b91b59d5a1801109fba5281d5846d086eb3561d2 | tree | snapshot |
| parent | e3172d80d5c527048d67310692a8a62efc2c01e5 | commit | diff |
| parent | 05e934bb9f7767e13e8a658b0e429a40076a6b35 | commit | diff |
Merge branch 'cb/mergetool'
* cb/mergetool:
Add a very basic test script for git mergetool
Teach git mergetool to use custom commands defined at config time
Changed an internal variable of mergetool to support custom commands
Tidy up git mergetool's backup file behaviour
* cb/mergetool:
Add a very basic test script for git mergetool
Teach git mergetool to use custom commands defined at config time
Changed an internal variable of mergetool to support custom commands
Tidy up git mergetool's backup file behaviour