DESCRIPTION

CBQE-3496: Add tests for revid and cas conflict resolution

Change-Id: Ifeb1d932079c945145eea2f67be33b75892da6b7


COMMENTS

author: Amani Conrad
date: 2016-07-01 16:38:49.164000000

Uploaded patch set 1.

-------------------------------------
author: Amani Conrad
date: 2016-07-01 16:39:10.736000000

Patch Set 1: Code-Review+2 Verified+1

-------------------------------------
author: Tate Garrett
date: 2016-07-01 16:39:22.544000000

Change has been successfully cherry-picked as 05000946695962ac8b1c0c1b953d8daf7e7d0f4d by Amani Conrad

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