From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 May 2009 22:00:15 +0000 (-0700)
Subject: Merge branch 'jc/maint-add-p-coalesce-fix'
X-Git-Tag: v1.6.4-rc0~111
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=659f09689614d3d745b9aea746672bf43216d294;p=git.git

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

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

659f09689614d3d745b9aea746672bf43216d294