From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 May 2011 18:37:46 +0000 (-0700)
Subject: Merge branch 'jc/maint-add-p-overlapping-hunks'
X-Git-Tag: v1.7.6-rc0~88
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f3b173daf400813c7f587a011290dac31de2b68e;p=git.git

Merge branch 'jc/maint-add-p-overlapping-hunks'

* 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
---

f3b173daf400813c7f587a011290dac31de2b68e