Merge algorithms

[Eli Zaretskii]

> Date: Mon, 8 Nov 2010 19:02:38 +1100
> From: Andrew Bennetts <andrew.bennetts at canonical.com>
> Cc: bazaar at lists.canonical.com
> 
> > Would it be possible for the plugin to detect that no
> > local changes are present, and fall back on the default merge
> > algorithm in that case?  Would that be a good idea?
> 
> Actually, it already does that!

Excellent, that explains how come I never saw any problems with
updating from upstream when I had no local changes.  So perhaps
there's no significant issues here.  I will keep an eye on this and
let you know.

Thanks.