xdiff-merge: optionally show conflicts in "diff3 -m" style

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index fee8fb77d48ef7d4fa08e77f879718d7ab5b1bc0..dbc90bc41625fccb4119cd6c2fc49668fe784122 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -498,4 +498,13 @@ test_expect_success 'merge fast-forward in a dirty tree' '
 
 test_debug 'gitk --all'
 
+test_expect_success 'in-index merge' '
+       git reset --hard c0 &&
+       git merge --no-ff -s resolve c1 > out &&
+       grep "Wonderful." out &&
+       verify_parents $c0 $c1
+'
+
+test_debug 'gitk --all'
+
 test_done