[MERGE] auto-resolve for commit

[Aaron Bentley]

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

Hi all,

I've gotten sick on being pestered to mark conflicts as resolved.  And I
don't like running 'resolve --all', because it disables a safeguard.

So here's auto_resolve.  It marks text conflicts as resolved at commit
time, if the corresponding file has no conflict markers.  But if it
does, you must either edit the file to remove the marker, or manually
mark the file as resolved (if the conflict marker is really supposed to
be there.)

That way, no one has to run resolve --all (99% of the time), but you
still get all the safety Bazaar already provides.

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

iD8DBQFFTtke0F+nu1YWqI0RArH6AJ9aHW974AZ3QxMj22Zh2hyqKuu1RACfcbDt
bcPR8jsZvq+PsKzNU4W0fCQ=
=NdXh
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: autoresolve.patch
Type: text/x-patch
Size: 6867 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061106/d64cb8fc/attachment.bin