diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:25:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:25:28 -0700 |
| commit | a1155adc2dde23fd664ad47399379cd0561762af (patch) | |
| tree | d7cc6994bc7f98b40e65d854af67f460d4e94ec3 /t/t4013/diff.format-patch_--inline_--stdout_initial..side | |
| parent | Git 1.7.3 (diff) | |
| parent | merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (diff) | |
| download | git-a1155adc2dde23fd664ad47399379cd0561762af.tar.gz git-a1155adc2dde23fd664ad47399379cd0561762af.zip | |
Merge branch 'en/rename-d-f' into en/merge-recursive
* en/rename-d-f:
merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
t3509: Add rename + D/F conflict testcase that recursive strategy fails
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..side')
0 files changed, 0 insertions, 0 deletions