[MERGE] Revert now resolves conflicts recursively (#102739)

Aaron Bentley aaron.bentley at utoronto.ca
Fri Nov 23 20:29:49 GMT 2007


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

Hi all,

Here's yet another simple patch for a high-priority bug.  It allows
"revert" to resolve conflicts recursively.

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

iD8DBQFHRzg90F+nu1YWqI0RAgU9AJ9g9pn3b69VvDsYrgb1ge59rK/RlACeJnr1
M2ICU3Swl56quXssgXnGc+Q=
=3GEU
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-sstVB2.patch
Type: text/x-patch
Size: 8138 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071123/ed93ba80/attachment-0001.bin 


More information about the bazaar mailing list