this test (and testResolveConflictWithAttachmentForRev2b) made more sense when we had a different conflict resolution behavior. They may again become more relevant when we start allowing for new revisions to be created as a result of conflict resolution. They do provide something of a sanity check, however.