From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Sep 2010 19:39:12 +0000 (-0700)
Subject: Merge branch 'ks/recursive-rename-add-identical'
X-Git-Tag: v1.7.3-rc2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9f0ccb5b0ac067b3408d3776bb06f85acd4a1e7e?hp=--cc

Merge branch 'ks/recursive-rename-add-identical'

* ks/recursive-rename-add-identical:
RE: [PATCH] Avoid rename/add conflict when contents are identical
---

9f0ccb5b0ac067b3408d3776bb06f85acd4a1e7e