mergetools / vimdiff3on commit Merge branch 'jk/pretty-G-format-fixes' (ce8350f)
   1. "$MERGE_TOOLS_DIR/vimdiff"