summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorNanako Shiraishi <nanako3@lavabit.com>2008-09-03 08:59:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-09-03 21:51:48 (GMT)
commit47a528ad24185133867ebb5bb7692db2cb8bef39 (patch)
tree9b46d4c6af949929f7ba2fe9f863b8304d0994fb /t/t7610-mergetool.sh
parentd592b3157f70c9dac6288b28c46a64826c0abd18 (diff)
downloadgit-47a528ad24185133867ebb5bb7692db2cb8bef39.zip
git-47a528ad24185133867ebb5bb7692db2cb8bef39.tar.gz
git-47a528ad24185133867ebb5bb7692db2cb8bef39.tar.bz2
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-xt/t7610-mergetool.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 9285071..09fa5f1 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'