From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 3 May 2009 22:02:52 +0000 (-0700)
Subject: Merge branch 'mk/maint-apply-swap' into maint
X-Git-Tag: v1.6.2.5~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c2eae0a5f604738b9ecce3d540ea48ceb0f2a869

Merge branch 'mk/maint-apply-swap' into maint

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

c2eae0a5f604738b9ecce3d540ea48ceb0f2a869