![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 3 May 2009 22:02:52 +0000 (15:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 3 May 2009 22:02:52 +0000 (15:02 -0700) | ||
| commit | c2eae0a5f604738b9ecce3d540ea48ceb0f2a869 | |
| tree | bf48f9c51a63da93ac656a921616f8442d28bbdf | tree | snapshot |
| parent | 00473fd1968ee887093dc66c616112f9dd2891ab | commit | diff |
| parent | f0583867e746985e9d62f57d5ba6ce27b2603447 | commit | diff |
Merge branch 'mk/maint-apply-swap' into maint
* 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
* 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