mergetools / vimdiff3on commit rebase: remove the rebase.useBuiltin setting (d03ebd4)
   1. "$MERGE_TOOLS_DIR/vimdiff"