diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-05-03 15:02:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-03 15:02:52 -0700 |
| commit | c2eae0a5f604738b9ecce3d540ea48ceb0f2a869 (patch) | |
| tree | bf48f9c51a63da93ac656a921616f8442d28bbdf /Documentation/git-merge.txt | |
| parent | Merge branch 'mm/maint-add-p-quit' into maint (diff) | |
| parent | tests: make test-apply-criss-cross-rename more robust (diff) | |
| download | tgif-c2eae0a5f604738b9ecce3d540ea48ceb0f2a869.tar.xz | |
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
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions