Code

Merge branch 'ks/recursive-rename-add-identical'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Sep 2010 19:39:12 +0000 (12:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Sep 2010 19:39:12 +0000 (12:39 -0700)
commit9f0ccb5b0ac067b3408d3776bb06f85acd4a1e7e
tree6e3056f75553bb79e27b0364f83aca2e906d672c
parent12644fa99fd16c33379c885670be0963cec07fc1
parentd5af51053cd060d7a4893f030626b04351554d1b
Merge branch 'ks/recursive-rename-add-identical'

* ks/recursive-rename-add-identical:
  RE: [PATCH] Avoid rename/add conflict when contents are identical
merge-recursive.c
t/t3030-merge-recursive.sh