From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Apr 2009 07:16:09 +0000 (-0700)
Subject: Merge branch 'mk/maint-apply-swap'
X-Git-Tag: v1.6.3-rc2~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0be9bc0f0a45ba667e7aaca14257da772b38e783;p=git.git

Merge branch 'mk/maint-apply-swap'

* mk/maint-apply-swap:
  tests: make test-apply-criss-cross-rename more robust
  builtin-apply: keep information about files to be deleted
  tests: test applying criss-cross rename patch

Conflicts:
	t/t4130-apply-criss-cross-rename.sh
---

0be9bc0f0a45ba667e7aaca14257da772b38e783