]> asedeno.scripts.mit.edu Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12644fa d5af510)
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 patch | diff1 | diff2 | blob | history
t/t3030-merge-recursive.sh patch | diff1 | diff2 | blob | history

diff --cc merge-recursive.c
Simple merge
diff --cc t/t3030-merge-recursive.sh
Simple merge
local clone of git.git