> - - New conflict-diff command, for doing diffs to understand conflicts
> better.
[...]
> For more information on BzrTools, please see http://bazaar-vcs.org/BzrTools
This page doesn't say anything about conflict-diff (which sounds
interesting, but would deserve a bit more explanation, so I was hoping
to find an example on that web page).
Stefan