mergetools / vimdiff3on commit Merge branch 'sg/t3020-typofix' (7205e22)
   1. "$MERGE_TOOLS_DIR/vimdiff"