tree a7d70a6b0a276027339339bdd4511f471c700bee
parent c66c0cbc7e55409ac934b7c6e89aa7aafa74ede4
parent 4fb1a19d502f4a2ca47bfb75cce605f3447819e6
author Junio C Hamano <gitster@pobox.com> 1230106454 -0800
committer Junio C Hamano <gitster@pobox.com> 1230106454 -0800

Merge branch 'js/rebase-i-p'

* js/rebase-i-p:
  rebase -i -p: leave a --cc patch when a merge could not be redone
  rebase -i -p: Fix --continue after a merge could not be redone
  Show a failure of rebase -p if the merge had a conflict