Merge branch 'maint'

diff --git a/t/t7606-merge-custom.sh b/t/t7606-merge-custom.sh
index de9b6ed5ba0d1753bbc45386bb3d4fe487ccc725..52a451dd5782ab584ba34e73abaef32d5e332537 100755 (executable)
--- 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.'