merge script: allow custom strategies
[git] / t / t5100 / patch0007