[MERGE] auto-resolve for commit

[Aaron Bentley]

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

Wouter van Heyst wrote:

>>Martin Pool wrote:
>>
>>
>>>This just requires WorkingTree.conflicts() to filter the list after it
>>>reads it and everything else should just work(?)

> Aaron, did you get around to this? It looks like it would address all
> concerns raised (well, perhaps not the performance one). I'd like to
> merge this next week if possible.

I started to, and then I got uncomfortable with the implications, so I
put it on the back burner.

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

iD8DBQFFavse0F+nu1YWqI0RAizqAJ47PlgXZaHsov9NtSEfzlTtttP7oQCfTKIs
gzupsgA8q3kkj9ljQzlz4DA=
=/y3s
-----END PGP SIGNATURE-----