t / test4012.pngon commit Display 'theirs' branch name when possible in merge. (e0ec181)
t/test4012.png