From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 May 2011 23:36:46 +0000 (-0700)
Subject: Merge branch 'jc/maint-add-p-overlapping-hunks' into maint
X-Git-Tag: v1.7.5.2~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c69e8b693591bc35e8f9421eacb9d59c71807304;p=git.git

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

c69e8b693591bc35e8f9421eacb9d59c71807304