mergetools / gvimdiff2on commit use parse_commit_or_die instead of custom message (367068e)
   1. "$MERGE_TOOLS_DIR/vimdiff"