Andrew's git / gitweb.git / diff
?
Merge branch 'mk/maint-apply-swap' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 May 2009 22:02:52 +0000 (15:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 May 2009 22:02:52 +0000 (15:02 -0700)
* 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

Trivial merge