mergetool: Skip autoresolved paths

diff --git a/t/t4121-apply-diffs.sh b/t/t4121-apply-diffs.sh
index b95b89c341d3da9bb6f22c68cbb1144380396155..aff551a1d787477eb2db34d96217f66ca03c435d 100755 (executable)
--- a/t/t4121-apply-diffs.sh
+++ b/t/t4121-apply-diffs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-apply for contextually independent diffs'
+test_description='git apply for contextually independent diffs'
 . ./test-lib.sh
 
 echo '1