apply: allow rerere() to work on --3way results
[git/mingw/4msysgit.git] / t / t4252 / file-1-0
blob06e567b11dfdafeaf7d3edcc89864149383aeab6