diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-21 00:16:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-21 00:16:09 -0700 |
| commit | 0be9bc0f0a45ba667e7aaca14257da772b38e783 (patch) | |
| tree | 8a282972652d17bc77864a0320cd1183723bf211 /t/t6031-merge-recursive.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | tests: make test-apply-criss-cross-rename more robust (diff) | |
| download | tgif-0be9bc0f0a45ba667e7aaca14257da772b38e783.tar.xz | |
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
Diffstat (limited to 't/t6031-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions