![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 8 Sep 2010 06:40:40 +0000 (00:40 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Sep 2010 00:01:32 +0000 (17:01 -0700) | ||
| commit | 56bfd762e5e602031eab8ce881b8ab0c50d2cfcc | |
| tree | 2b3616b6603970b60ec44bc7188a10629d21ed69 | tree | snapshot |
| parent | 154adcf9c08218077275f7a4c7a6e61632516561 | commit | diff |
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>
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>
| t/t3509-cherry-pick-merge-df.sh | diff | blob | history |