X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6037-merge-ours-theirs.sh;h=8ab3d61f445725ec48b8b4ce28cfbf4a9ce13844;hb=b599672316ae0e0cf827e5e2cd6d3bb403d7b8cd;hp=08c9f7989a578d57a3c0f868786fa6b4cc2bf777;hpb=8cc5b29065e19267cbc08b39c34674b02c2e3d59;p=git.git

diff --git a/t/t6037-merge-ours-theirs.sh b/t/t6037-merge-ours-theirs.sh
index 08c9f7989..8ab3d61f4 100755
--- a/t/t6037-merge-ours-theirs.sh
+++ b/t/t6037-merge-ours-theirs.sh
@@ -53,4 +53,12 @@ test_expect_success 'recursive favouring ours' '
 	! grep 1 file
 '
 
+test_expect_success 'pull with -X' '
+	git reset --hard master && git pull -s recursive -Xours . side &&
+	git reset --hard master && git pull -s recursive -X ours . side &&
+	git reset --hard master && git pull -s recursive -Xtheirs . side &&
+	git reset --hard master && git pull -s recursive -X theirs . side &&
+	git reset --hard master && ! git pull -s recursive -X bork . side
+'
+
 test_done