diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-12-22 22:16:51 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-24 00:14:08 -0800 |
| commit | 4fb1a19d502f4a2ca47bfb75cce605f3447819e6 (patch) | |
| tree | 0a7fe923328aa0011f7651e9d32b20926b52e590 /t/t3409-rebase-preserve-merges.sh | |
| parent | f5b49ea6191c2d631d1d70305b25d5db3bf05c92 (diff) | |
| download | git-4fb1a19d502f4a2ca47bfb75cce605f3447819e6.tar.gz git-4fb1a19d502f4a2ca47bfb75cce605f3447819e6.tar.xz | |
rebase -i -p: leave a --cc patch when a merge could not be redone
The result is easier to review this way, and the merge resolution has to be
done inside the work tree, not by adjusting "the patch" anyway.
Diffstat (limited to 't/t3409-rebase-preserve-merges.sh')
| -rwxr-xr-x | t/t3409-rebase-preserve-merges.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh index 820e0105d..e6c832780 100755 --- a/t/t3409-rebase-preserve-merges.sh +++ b/t/t3409-rebase-preserve-merges.sh @@ -83,6 +83,7 @@ test_expect_success '--continue works after a conflict' ' test 2 = $(git ls-files B | wc -l) && echo Resolved again > B && test_must_fail git rebase --continue && + grep "^@@@ " .git/rebase-merge/patch && git add B && git rebase --continue && test 1 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) && |