Re: Special 1.5.x branch for issue2489 (SSL client certificate passphrase cache)

On Tue, Aug 12, 2008 at 11:54:36AM +0200, svnlgo_at_mobsol.be wrote:
> Quoting Mark Phippard <markphip_at_gmail.com>:
> > Merge completed abnormally.
> > ===== File Statistics: =====
> > Conflicts: 1
> > Merged: 8
> > Added: 4
> > Updated: 16
> > ==== Property Statistics: =====
> > Merged: 2
> > resolve --accept=working
>
> OT: Why don't the Skipped files show up in the merge results summary? These can
> be the worst type of conflicts.
>

Yes, skipped files during merge are generally tree conflicts.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-12 12:47:03 CEST