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)
* ks/recursive-rename-add-identical:
  RE: [PATCH] Avoid rename/add conflict when contents are identical

1  2 
merge-recursive.c
t/t3030-merge-recursive.sh

Simple merge
Simple merge