DESCRIPTION

CBQE-3501: Add tests for skip conflict resolution

Change-Id: Iac84352c0643dc4bdd9dcfe881de9be36dac29f6


COMMENTS

author: Amani Conrad
date: 2016-06-30 23:38:14.555000000

Uploaded patch set 1.

-------------------------------------
author: Amani Conrad
date: 2016-06-30 23:39:19.949000000

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

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

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

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