mergetools / vimdiff3on commit switch: better names for -b and -B (b7b5fce)
   1. "$MERGE_TOOLS_DIR/vimdiff"