mergetools / gvimdiff3on commit Merge branch 'mm/config-color-ui-default-to-auto' (7fcc056)
   1. "$MERGE_TOOLS_DIR/vimdiff"