From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 Jul 2014 19:53:04 +0000 (-0700)
Subject: Merge branch 'bc/fix-rebase-merge-skip'
X-Git-Tag: v2.1.0-rc0~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6293aea559b6c8f224f748e5a2a641ddb6cca55a;p=thirdparty%2Fgit.git

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

"git rebase --skip" did not work well when it stopped due to a
conflict twice in a row.

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

6293aea559b6c8f224f748e5a2a641ddb6cca55a