Merge branch 'sb/show-branch-parse-options'

[git] / t / t7605-merge-resolve.sh

diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh
index f1f86dd..0cb9d11 100755 (executable)
--- a/t/t7605-merge-resolve.sh
+++ b/t/t7605-merge-resolve.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-merge
+test_description='git merge
 
 Testing the resolve strategy.'