diff options
| author | Nanako Shiraishi <nanako3@lavabit.com> | 2008-09-03 10:59:33 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 23:51:48 +0200 |
| commit | 47a528ad24185133867ebb5bb7692db2cb8bef39 (patch) | |
| tree | 9b46d4c6af949929f7ba2fe9f863b8304d0994fb /t/t7610-mergetool.sh | |
| parent | tests: use "git xyzzy" form (t7000 - t7199) (diff) | |
| download | git-47a528ad24185133867ebb5bb7692db2cb8bef39.tar.xz git-47a528ad24185133867ebb5bb7692db2cb8bef39.zip | |
tests: use "git xyzzy" form (t7200 - t9001)
Converts tests between t7201-t9001.
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7610-mergetool.sh')
| -rwxr-xr-x | t/t7610-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 9285071c47..09fa5f115c 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -3,7 +3,7 @@ # Copyright (c) 2008 Charles Bailey # -test_description='git-mergetool +test_description='git mergetool Testing basic merge tool invocation' |