t / test4012.pngon commit git-merge: minor fix for no_trivial_merge_strategies. (de6f0de)
t/test4012.png