summaryrefslogtreecommitdiff
path: root/t/t7604-merge-custom-message.sh
diff options
context:
space:
mode:
authorNanako Shiraishi <nanako3@lavabit.com>2008-09-03 17:59:33 +0900
committerJunio C Hamano <gitster@pobox.com>2008-09-03 14:51:48 -0700
commit47a528ad24185133867ebb5bb7692db2cb8bef39 (patch)
tree9b46d4c6af949929f7ba2fe9f863b8304d0994fb /t/t7604-merge-custom-message.sh
parentd592b3157f70c9dac6288b28c46a64826c0abd18 (diff)
downloadgit-47a528ad24185133867ebb5bb7692db2cb8bef39.tar.gz
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/t7604-merge-custom-message.sh')
-rwxr-xr-xt/t7604-merge-custom-message.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh
index 6081677d23..de977c5e2f 100755
--- a/t/t7604-merge-custom-message.sh
+++ b/t/t7604-merge-custom-message.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-test_description='git-merge
+test_description='git merge
Testing merge when using a custom message for the merge commit.'