?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 12644fa d5af510)
Merge branch 'ks/recursive-rename-add-identical'
commit9f0ccb5b0ac067b3408d3776bb06f85acd4a1e7e
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Sep 2010 19:39:12 +0000 (15 12:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Sep 2010 19:39:12 +0000 (15 12:39 -0700)
tree6e3056f75553bb79e27b0364f83aca2e906d672ctree | snapshot (tar.gz zip)
parent12644fa99fd16c33379c885670be0963cec07fc1commit | diff
parentd5af51053cd060d7a4893f030626b04351554d1bcommit | diff
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 diff1 |  diff2 |  blob | history
t/t3030-merge-recursive.sh diff1 |  diff2 |  blob | history
git with Jakub Narębski modifications