mergetools / gvimdiff3on commit Merge branch 'as/diff-options-grammofix' (ddd1133)
   1. "$MERGE_TOOLS_DIR/vimdiff"