mergetools / gvimdiff2on commit branch: drop non-commit error reporting (ca41799)
   1. "$MERGE_TOOLS_DIR/vimdiff"