mergetools / vimdiff3on commit am: improve author-script error reporting (442c36b)
   1. "$MERGE_TOOLS_DIR/vimdiff"