Code

Merge branch 'jc/maint-add-p-overlapping-hunks'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 May 2011 18:37:46 +0000 (11:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 May 2011 18:37:46 +0000 (11:37 -0700)
* 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

1  2 
builtin/apply.c
t/t3701-add-interactive.sh

diff --cc builtin/apply.c
Simple merge
Simple merge