Add 'ours' merge strategy.
[git] / debian / git-core.files
1 /usr