t / test4012.pngon commit git-svn: allow dcommit to retain local merge information (733a65a)
t/test4012.png