Add 'ours' merge strategy.
[git] / debian / docs
1 README