diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-08 00:40:40 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-09 17:01:32 -0700 |
| commit | 56bfd762e5e602031eab8ce881b8ab0c50d2cfcc (patch) | |
| tree | 2b3616b6603970b60ec44bc7188a10629d21ed69 /merge-recursive.c | |
| parent | 154adcf9c08218077275f7a4c7a6e61632516561 (diff) | |
| download | git-56bfd762e5e602031eab8ce881b8ab0c50d2cfcc.tar.gz | |
t3509: Add rename + D/F conflict testcase that recursive strategy fails
When one side of a file rename matches a directory name on the other side,
the recursive merge strategy will fail. This is true even if the merge is
trivially resolvable.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions