mergetools / vimdiff3on commit tests (rebase): spell out the `--force-rebase` option (f927ae6)
   1. "$MERGE_TOOLS_DIR/vimdiff"