From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 Jun 2009 14:46:52 +0000 (-0700)
Subject: Merge branch 'jc/maint-add-p-coalesce-fix' into maint
X-Git-Tag: v1.6.3.2~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f2823263bd53b62831450277c746c6cbfcb95a15;p=git.git

Merge branch 'jc/maint-add-p-coalesce-fix' into maint

* jc/maint-add-p-coalesce-fix:
  t3701: ensure correctly set up repository after skipped tests
  Revert "git-add--interactive: remove hunk coalescing"
  Splitting a hunk that adds a line at the top fails in "add -p"
---

f2823263bd53b62831450277c746c6cbfcb95a15