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