mergetool: Skip autoresolved paths

diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh
index 2a46af24d6ae76dd057a88960a815c53b526d1b8..d5d6244178137cddc985ad4fc32ee3e78c7c5746 100755 (executable)
--- a/t/t1508-at-combinations.sh
+++ b/t/t1508-at-combinations.sh
@@ -45,7 +45,7 @@ check "@{u}" upstream-two
 check "@{u}@{1}" upstream-one
 check "@{-1}@{u}" master-two
 check "@{-1}@{u}@{1}" master-one
-fail nonsense "@{u}@{-1}"
+nonsense "@{u}@{-1}"
 nonsense "@{1}@{u}"
 
 test_done