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