Code review comment for lp:~chipaca/u1db/prune-conflicts-automerges

needs testing of the lines:

108 + if doc.rev != rev:
109 + # conflicts have been autoresolved
110 + state = 'superseded'

also some integration testing in test_sync how they behave in there, the idea is that the autoresolved document will be sent back if I understand correctly