[MERGE] Merge now warns when it encounters a criss-cross

Aaron Bentley aaron.bentley at utoronto.ca
Fri Nov 30 18:58:35 GMT 2007


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

John Arbash Meinel wrote:
> Well, you can have it as a help topic. And then they can do:
> 
> bzr help criss-cross-merge
> 
> Which makes it very easy to link from the error message.

Here is a patch that adds the help topic as suggested.

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

iD8DBQFHUF1b0F+nu1YWqI0RAsJQAJ0b2aqrUWO1ts/YAeEo7vSUHIGmCwCdGpPA
bbOEwx32wVjD147otBaFAQw=
=xmEh
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: criss-cross-2.patch
Type: text/x-patch
Size: 11790 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071130/1c100030/attachment-0001.bin 


More information about the bazaar mailing list