X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=t%2Ft1000-read-tree-m-3way.sh;h=89f0e81f2335e4ade732a22789d8bb1b1a13e908;hb=da7bc9b081ad8e45c997678c4ab4e7da9cd335ed;hp=3d9b3ac9b0d8f6a4ea8459be943439f333ba5bd1;hpb=32192e6622d78347448cfc0572827d6e64e0de28;p=git.git

diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh
index 3d9b3ac9..89f0e81f 100755
--- a/t/t1000-read-tree-m-3way.sh
+++ b/t/t1000-read-tree-m-3way.sh
@@ -464,6 +464,15 @@ test_expect_success \
      git-read-tree -m $tree_O $tree_A $tree_B &&
      check_result"
 
+test_expect_success \
+    '14 - may match B in O && A && B && O==A && O!=B case' \
+    "rm -f .git/index NM &&
+     cp .orig-B/NM NM &&
+     git-update-cache --add NM &&
+     echo extra >>NM &&
+     git-read-tree -m $tree_O $tree_A $tree_B &&
+     check_result"
+
 test_expect_failure \
     '14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case' \
     "rm -f .git/index NM &&