Code

Merge branch 'jc/maint-add-p-overlapping-hunks' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:36:46 +0000 (16:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:36:46 +0000 (16:36 -0700)
commitc69e8b693591bc35e8f9421eacb9d59c71807304
treefef8fdcbd924820c5b25e2671be2d92219de23aa
parent43d532e6ba3450a84cad007062b8ac429d7a8ac3
parent0bf9fc0cd28bf8e983a5280676fcaeb826403516
Merge branch 'jc/maint-add-p-overlapping-hunks' into maint

* jc/maint-add-p-overlapping-hunks:
  t3701: add-p-fix makes the last test to pass
  "add -p": work-around an old laziness that does not coalesce hunks
  add--interactive.perl: factor out repeated --recount option
  t3701: Editing a split hunk in an "add -p" session
  add -p: 'q' should really quit
builtin/apply.c
t/t3701-add-interactive.sh