diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:29:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:29:47 -0700 |
| commit | 06d11b2e8d9d78d01212024f0f410e4193cbb5bd (patch) | |
| tree | b0deab7259afb582a269aadce0547a5f9ee18b44 /t | |
| parent | Merge branch 'jn/fix-abbrev' (diff) | |
| parent | rebase: support -X to pass through strategy options (diff) | |
| download | tgif-06d11b2e8d9d78d01212024f0f410e4193cbb5bd.tar.xz | |
Merge branch 'ml/rebase-x-strategy'
* ml/rebase-x-strategy:
rebase: support -X to pass through strategy options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3402-rebase-merge.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index 7b7d07269a..2bea65634a 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 |