From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 18 Apr 2009 04:42:13 +0000 (-0700)
Subject: Merge branch 'mk/apply-swap'
X-Git-Tag: v1.6.3-rc1~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fc917ad6b294366d3afc7a14b1bfe41fa8c567a2;p=git.git

Merge branch 'mk/apply-swap'

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

fc917ad6b294366d3afc7a14b1bfe41fa8c567a2