mergetools / vimdiff3on commit unpack-trees: fix English grammar in do-this-before-that messages (c2691e2)
   1. "$MERGE_TOOLS_DIR/vimdiff"