mergetools / gvimdiff2on commit Merge branch 'rj/add-chmod-error-message' into maint (70def2c)
   1. "$MERGE_TOOLS_DIR/vimdiff"