![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 Sep 2010 00:25:28 +0000 (17:25 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 Sep 2010 00:25:28 +0000 (17:25 -0700) |
* 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
merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
t3509: Add rename + D/F conflict testcase that recursive strategy fails
| 1 | 2 | |||
|---|---|---|---|---|
| merge-recursive.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc merge-recursive.c
Simple merge