merge: make merge.renormalize work for all uses of merge machinery
[git] / t / t5100 / patch0008