summaryrefslogtreecommitdiff
path: root/t/t7606-merge-custom.sh
diff options
context:
space:
mode:
authorNanako Shiraishi <nanako3@lavabit.com>2008-09-10 06:25:27 +0900
committerJunio C Hamano <gitster@pobox.com>2008-09-09 22:59:00 -0700
commitf964732c0560743b666ad4e189a6b148dacf6923 (patch)
treef6291e958d4dcca660f1e91f998319a88e432495 /t/t7606-merge-custom.sh
parent1f77354b024e2f449242f4c3b70111aa5ff608d5 (diff)
downloadgit-f964732c0560743b666ad4e189a6b148dacf6923.tar.gz
tests: use "git foo" without dash in strings
This changes "git-foo" to "git foo" when message strings in tests name git subcommands. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7606-merge-custom.sh')
-rwxr-xr-xt/t7606-merge-custom.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7606-merge-custom.sh b/t/t7606-merge-custom.sh
index de9b6ed5ba..52a451dd57 100755
--- a/t/t7606-merge-custom.sh
+++ b/t/t7606-merge-custom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-test_description='git-merge
+test_description='git merge
Testing a custom strategy.'