merge-ort: fix issue with dual rename and add/add conflict
[git.git] / t / t4252 / file-2-0
blob06e567b11dfdafeaf7d3edcc89864149383aeab6