diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-07-02 12:53:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-02 12:53:04 -0700 |
| commit | 6293aea559b6c8f224f748e5a2a641ddb6cca55a (patch) | |
| tree | 0d67ca045e0ffb1d92a1a11e3e7aa4b7e58cc6b3 /xdiff-interface.h | |
| parent | Merge branch 'jk/commit-buffer-length' (diff) | |
| parent | rebase--merge: fix --skip with two conflicts in a row (diff) | |
| download | tgif-6293aea559b6c8f224f748e5a2a641ddb6cca55a.tar.xz | |
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
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions