git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87b5054 86273e5)
Merge branch 'en/rename-d-f' into en/merge-recursive
authorJunio C Hamano <redacted>
Thu, 30 Sep 2010 00:25:28 +0000 (17:25 -0700)
committerJunio C Hamano <redacted>
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

1  2 
merge-recursive.c patch | diff1 | diff2 | blob | history

diff --cc merge-recursive.c
Simple merge
git clone https://git.99rst.org/PROJECT