![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Apr 2009 07:16:09 +0000 (00:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Apr 2009 07:16:09 +0000 (00:16 -0700) | ||
| commit | 0be9bc0f0a45ba667e7aaca14257da772b38e783 | |
| tree | 8a282972652d17bc77864a0320cd1183723bf211 | tree | snapshot |
| parent | 062868cc003d5952f11c7c9cd3940ae7d675960a | commit | diff |
| parent | f0583867e746985e9d62f57d5ba6ce27b2603447 | commit | diff |
Merge branch 'mk/maint-apply-swap'
* 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
* 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