X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7605-merge-resolve.sh;h=0cb9d11f2171de19b260391017310f0ee792f89b;hb=2ea3c17189bf9ca459879129ca190792b5451f05;hp=f1f86ddb2381ce70e6845298e86ed96d6399fdf9;hpb=fb7092807962af168a76f6d8cbab02150daa0b5a;p=git.git

diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh
index f1f86ddb2..0cb9d11f2 100755
--- 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.'