RELEASE BzrTools 1.14.0

[Aaron Bentley]

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

Stefan Monnier wrote:
>> - - 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).

When text conflicts occur, bzr creates copies of the conflicting files
with the extensions .THIS, .BASE, and .OTHER.  conflict-diff is a
convenient way of diffing the .OTHER file or .THIS file against the
.BASE.  For merge types that don't produce a .BASE (weave, lca), it
determines what the BASE would have been, and diffs against that.

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

iEYEARECAAYFAknf2N8ACgkQ0F+nu1YWqI0FGgCfd8A5+qF4wTi0quvoM3OhvyNr
4A4AnRa1Hu/rnAAEDFXswe6cGiNrWL4q
=Iwts
-----END PGP SIGNATURE-----