diff options
author | Nanako Shiraishi <nanako3@lavabit.com> | 2008-09-03 17:59:33 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 14:51:48 -0700 |
commit | 47a528ad24185133867ebb5bb7692db2cb8bef39 (patch) | |
tree | 9b46d4c6af949929f7ba2fe9f863b8304d0994fb /t/t7610-mergetool.sh | |
parent | d592b3157f70c9dac6288b28c46a64826c0abd18 (diff) | |
download | git-47a528ad24185133867ebb5bb7692db2cb8bef39.tar.gz git-47a528ad24185133867ebb5bb7692db2cb8bef39.tar.xz |
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 9285071c4..09fa5f115 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' |