tree 7351491dafe9aad3d179dad5567623a4594341bd
parent c394d05a47405d3fffc7c5e4df7ca9f649d0cc69
author Tomasz Zarna <Tomasz.Zarna@pl.ibm.com> 1331831056 +0100
committer Chris Aniszczyk <zx@twitter.com> 1336699436 -0700

Cleanup MergeResult constructors

'mergeStrategy' should be 5th argument, after 'mergeStatus'. Pass
'description' if available.

Change-Id: I97cebfe5d7db6247fe899075d917b82955906f85
Signed-off-by: Chris Aniszczyk <zx@twitter.com>