ll-merge: warn about inability to merge binary files only when we can't
[git.git] / t / t4252 / file-1-0
blob06e567b11dfdafeaf7d3edcc89864149383aeab6