t / test4012.pngon commit Add -y/--no-prompt option to mergetool (682b451)
t/test4012.png