mergetools / vimdiff2on commit push: check for errors earlier (800a4ab)
   1. "$MERGE_TOOLS_DIR/vimdiff"