DESCRIPTION

CBQE-3501: Add tests for skip conflict resolution

Change-Id: Iac84352c0643dc4bdd9dcfe881de9be36dac29f6
Reviewed-on: http://review.couchbase.org/65418
Reviewed-by: Amani Conrad <Amani xxx@xxx.xxx
Tested-by: Amani Conrad <Amani xxx@xxx.xxx


COMMENTS

author: Tate Garrett
date: 2016-06-30 23:39:38.722000000

Change has been successfully cherry-picked as b5b7262049b89c52c11503fd021bda7833fa7584 by Amani Conrad

-------------------------------------
