Fix source code formatting errors in MergeOp

Change-Id: I0428ecee3a370af0da536d9d7eeb7fb1924df3a1
Signed-off-by: Shawn O. Pearce <sop@google.com>
1 file changed