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

brian m. carlson committed over 12 years ago

Third batch for 2.1

Junio C Hamano committed over 12 years ago

Merge branch 'ib/test-selectively-run'

Junio C Hamano committed over 12 years ago

Merge branch 'ta/string-list-init'

Junio C Hamano committed over 12 years ago

Merge branch 'jm/dedup-test-config'

Junio C Hamano committed over 12 years ago

Merge branch 'dt/refs-check-refname-component-optim'

Junio C Hamano committed over 12 years ago

Merge branch 'sk/test-cmp-bin'

Junio C Hamano committed over 12 years ago

Merge branch 'sh/enable-preloadindex'

Junio C Hamano committed over 12 years ago

Merge branch 'rs/read-ref-at'

Junio C Hamano committed over 12 years ago

Merge branch 'jk/error-resolve-conflict-advice'

Junio C Hamano committed over 12 years ago

Merge branch 'rs/pack-objects-no-unnecessary-realloc'

Junio C Hamano committed over 12 years ago

Merge branch 'lt/log-auto-decorate'

Junio C Hamano committed over 12 years ago

Merge branch 'jm/doc-wording-tweaks'

Junio C Hamano committed over 12 years ago

Merge branch 'jm/format-patch-mail-sig'

Junio C Hamano committed over 12 years ago

Merge branch 'jk/http-errors'

Junio C Hamano committed over 12 years ago

Merge branch 'ow/config-mailmap-pathname'

Junio C Hamano committed over 12 years ago

Merge branch 'fc/remote-helper-refmap'

Junio C Hamano committed over 12 years ago

Merge branch 'nd/daemonize-gc'

Junio C Hamano committed over 12 years ago

Merge branch 'jm/t9138-style-fix'

Junio C Hamano committed over 12 years ago

Merge branch 'jm/instaweb-apache-24'

Junio C Hamano committed over 12 years ago