diff options
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
| -rwxr-xr-x | t/t6037-merge-ours-theirs.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t6037-merge-ours-theirs.sh b/t/t6037-merge-ours-theirs.sh index 08c9f7989a..8ab3d61f44 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 |