X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3402-rebase-merge.sh;h=2bea65634a1790ceecf824309c1fbb66250f58d5;hb=d0bb13663000be47d83cbe53b6c4bdc8835625cb;hp=7b7d07269ae35f56dd02a223f350ae0da97bae85;hpb=04bf4483eab68301f44b912b3364db6d07542c72;p=git.git

diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index 7b7d07269..2bea65634 100755
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -74,6 +74,15 @@ test_expect_success 'rebase the other way' '
 	git rebase --merge side
 '
 
+test_expect_success 'rebase -Xtheirs' '
+	git checkout -b conflicting master~2 &&
+	echo "AB $T" >> original &&
+	git commit -mconflicting original &&
+	git rebase -Xtheirs master &&
+	grep AB original &&
+	! grep 11 original
+'
+
 test_expect_success 'merge and rebase should match' '
 	git diff-tree -r test-rebase test-merge >difference &&
 	if test -s difference