merge-recursive: conflicting rename case.
[git.git] / debian / git-core.files
1 /usr