From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Jul 2014 18:16:16 +0000 (-0700)
Subject: Merge branch 'bc/fix-rebase-merge-skip' into maint
X-Git-Tag: v2.0.2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64630d807ae0a9717ae39c87bd1458bf15c62142;p=thirdparty%2Fgit.git

Merge branch 'bc/fix-rebase-merge-skip' into maint

During "git rebase --merge", a conflicted patch could not be
skipped with "--skip" if the next one also conflicted.

* bc/fix-rebase-merge-skip:
  rebase--merge: fix --skip with two conflicts in a row
---

64630d807ae0a9717ae39c87bd1458bf15c62142