checkout -m --conflict=diff3: add a label for ancestor

diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh
index 59f04636f20e0f513cfcb5e4f1f867010856f3f5..d5d6244178137cddc985ad4fc32ee3e78c7c5746 100755 (executable)
--- a/t/t1508-at-combinations.sh
+++ b/t/t1508-at-combinations.sh
@@ -43,9 +43,9 @@ check "@{-1}" old-two
 check "@{-1}@{1}" old-one
 check "@{u}" upstream-two
 check "@{u}@{1}" upstream-one
-fail check "@{-1}@{u}" master-two
-fail check "@{-1}@{u}@{1}" master-one
-fail nonsense "@{u}@{-1}"
+check "@{-1}@{u}" master-two
+check "@{-1}@{u}@{1}" master-one
+nonsense "@{u}@{-1}"
 nonsense "@{1}@{u}"
 
 test_done