Conflicts history

[Robert Collins]

On Thu, 2008-07-03 at 12:53 +0300, Panagiotis Papadakos wrote:
> Hello list.
> 
> 
> I was wondering if there is any way that bzr could show all 
> the conflicts history, in case someone would like to see the
> way they were resolved. 

We haven't written such a command, but there is enough information in
the system to come close..

We know all the merges; and we know the results. We don't know which
merge algorithm was used at each point though. But we could guess in a
number of ways.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080703/ae8e645e/attachment.pgp