mergetools / gvimdiff2on commit Merge branch 'maint' (4cb8a83)
   1. "$MERGE_TOOLS_DIR/vimdiff"