![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Charles Bailey <charles@hashpling.org> | |
| Thu, 21 Feb 2008 23:31:56 +0000 (23:31 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Mar 2008 20:07:04 +0000 (12:07 -0800) | ||
| commit | 05e934bb9f7767e13e8a658b0e429a40076a6b35 | |
| tree | dc907dcc748635a7579b2ff9e51f92b44d3721b7 | tree | snapshot |
| parent | 964473a0429f625d019c69ab55644540174acf85 | commit | diff |
Add a very basic test script for git mergetool
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7610-mergetool.sh | [new file with mode: 0644] | blob |