[MERGE] conflicts --text

[Aaron Bentley]

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

Hi all,

This bundle adds a --text option to the conflicts command, which causes
it to list the pathnames of files with text conflicts.  This should make
it easier to invoke your favourite editor on all files with text conflicts.

There's no pressing need to supply this for other conflict types,
because you can't fix those kinds of problems with an editor.  And it
would be hard to apply to path conflicts, where more than one pathname
participates in each conflict.

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

iD8DBQFFdfCZ0F+nu1YWqI0RAhpWAJ402WOgqk8zVcM2sbHeqrYzZSuXbACeJvli
yEdZeHR/tRgIxIrYJPfjXk4=
=Dr3Y
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: conflicts-text.patch
Type: text/x-patch
Size: 4628 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061205/09a81abd/attachment.bin