![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 18 Apr 2009 04:42:13 +0000 (21:42 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 18 Apr 2009 04:42:13 +0000 (21:42 -0700) | ||
| commit | fc917ad6b294366d3afc7a14b1bfe41fa8c567a2 | |
| tree | ea5e1d76bbe27a09f4ae4c173b57afa24e81e364 | tree | snapshot |
| parent | 66aae6c1bac1668483f3dbe3875fc9d9655e9408 | commit | diff |
| parent | 7fac0eef91cf930ef827b00934701fa5543dce76 | commit | diff |
Merge branch 'mk/apply-swap'
* mk/apply-swap:
builtin-apply: keep information about files to be deleted
tests: test applying criss-cross rename patch
* mk/apply-swap:
builtin-apply: keep information about files to be deleted
tests: test applying criss-cross rename patch