pub fn tree( repo: Repository, out: &mut dyn Write, err: &mut dyn Write, base: BString, ours: BString, theirs: BString, _: Options, ) -> Result<()>