]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/maint-add-p-coalesce-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Jun 2009 14:46:52 +0000 (07:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jun 2009 14:46:52 +0000 (07:46 -0700)
* 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"


Trivial merge