mergetools / gvimdiff3on commit pull: enclose <options> in brackets in the usage string (e7a7401)
   1. "$MERGE_TOOLS_DIR/vimdiff"