Andrew's git / gitweb.git / diff
?
Merge branch 'mk/maint-apply-swap'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Apr 2009 07:16:09 +0000 (00:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Apr 2009 07:16:09 +0000 (00:16 -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

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

Trivial merge