mergetools / gvimdiffon commit Merge branch 'ac/log-use-mailmap-by-default-transition' (c7cf2de)
   1. "$MERGE_TOOLS_DIR/vimdiff"