diff options
| -rwxr-xr-x | git-rebase--interactive.sh | 3 | ||||
| -rwxr-xr-x | t/t3409-rebase-preserve-merges.sh | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 1172e47571..89c39ebc9d 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -256,9 +256,8 @@ pick_one_preserving_merges () { output git merge $STRATEGY -m "$msg" \ $new_parents then - git rerere printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG - die Error redoing merge $sha1 + die_with_patch $sha1 "Error redoing merge $sha1" fi ;; *) diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh index 5ddd1d1a93..820e0105d2 100755 --- a/t/t3409-rebase-preserve-merges.sh +++ b/t/t3409-rebase-preserve-merges.sh @@ -75,7 +75,7 @@ test_expect_success 'rebase -p fakes interactive rebase' ' ) ' -test_expect_failure '--continue works after a conflict' ' +test_expect_success '--continue works after a conflict' ' ( cd clone2 && git fetch && |