index 55aa6b5f2716255b2b5aa74f1cac9d285de6d6a8..7ba94ea99bc0785da5b398e494d23469ba44992d 100755 (executable)
#!/bin/sh
#!/bin/sh
-test_description='git-merge
+test_description='git merge
Testing pull.* configuration parsing.'
Testing pull.* configuration parsing.'