[RFC] A better way to help users understand and resolve confclits

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Guilhem Bichot wrote:
> So I need to see the diff associated with the revision which deleted "1"
> (to see if "1" was put in some other file). Either through "bzr
> gannotate" or "bzr qlog FILE", usually.
> 
> This is even more pressing when using --weave where there is no BASE
> section.

There is a command to generate such diffs in bzrtools: conflict-diff.
It will synthesize a BASE if none is present.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkqUPK8ACgkQ0F+nu1YWqI1drACfR00gcUZ3JKznEzbGf1LNntSj
rswAn1AzSCiuZiclzA/s6OMLNpRNNEx8
=eF9q
-----END PGP SIGNATURE-----