merge-one-file: use common as base, instead of emptiness.
[git/gitweb.git] / debian / git-core.files
blob74e4e23b0176541176f4e5f591bcbe3c6b5e4cde
1 /usr