mergetools / gvimdiff3on commit Merge branch 'maint-2.0' into maint (3c2dc76)
   1. "$MERGE_TOOLS_DIR/vimdiff"