Andrew's git / gitweb.git / diff
?
Merge branch 'mk/apply-swap'
authorJunio C Hamano <gitster@pobox.com>
Sat, 18 Apr 2009 04:42:13 +0000 (21:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 18 Apr 2009 04:42:13 +0000 (21:42 -0700)
* mk/apply-swap:
builtin-apply: keep information about files to be deleted
tests: test applying criss-cross rename patch

Trivial merge