tree 6e3056f75553bb79e27b0364f83aca2e906d672c
parent 12644fa99fd16c33379c885670be0963cec07fc1
parent d5af51053cd060d7a4893f030626b04351554d1b
author Junio C Hamano <gitster@pobox.com> 1284579552 -0700
committer Junio C Hamano <gitster@pobox.com> 1284579552 -0700

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

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