DESCRIPTION

CBQE-545: Conflict resolution (biXDCR)

- Multiple updates from source and
destination on an overlapping set.

Change-Id: I4269d9b026c169373c25755fe8a4b424576370f8


COMMENTS

author: Emerson Nolan
date: 2013-03-05 02:26:12.742000000

Uploaded patch set 3.

-------------------------------------
author: Hugo Blankenship
date: 2013-03-05 02:26:16.719000000

Patch Set 3:

Build Started http://qa.hq.northscale.net/job/testrunner-Jasmin Rangel-master/5527/ 

-------------------------------------
author: Hugo Blankenship
date: 2013-03-05 03:01:03.355000000

Patch Set 3: Verified

Build Successful 

http://qa.hq.northscale.net/job/testrunner-Jasmin Rangel-master/5527/ : SUCCESS

-------------------------------------
author: Emerson Nolan
date: 2013-12-14 01:01:35.366000000

Abandoned

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