mergetools / vimdiff3on commit Merge branch 'mm/log-format-raw-doc' (abcbafe)
   1. "$MERGE_TOOLS_DIR/vimdiff"