[MERGE] auto-resolve for text conflicts

[Aaron Bentley]

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

Hi all,

This patch changes the behavior of "resolve", so that if it is invoked
with no arguments, text conflicts are automatically resolved.

Only files with now "herringbone" <<<<<<< markers are considered
resolved.  Other files are not auto-resolved.

I originally had grander ideas to make this functionality easier to use,
but there turn out to be subtle issues with that.  So half a loaf is
better than none.

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

iD8DBQFF6lrK0F+nu1YWqI0RAoHJAJ97pj0yHpn8/In46uFw9b7M2KOdcwCfQC2C
D36zABdUIk3VdE6zk7jvME4=
=FvoN
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: autoresolve.diff
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20070304/dbc9b817/attachment-0001.diff