510 

   510 

   511     m3 = Merge3Text(base.text(), local.text(), other.text())

   511     m3 = Merge3Text(base.text(), local.text(), other.text())

   512     conflicts = False

   512     conflicts = False

   513     if mode == b'union':

   513     if mode == b'union':

   514         lines = _resolve(m3, (1, 2))

   514         lines = _resolve(m3, (1, 2))

   515     elif mode == b'local':

   517     elif mode == b'local':

   516         lines = _resolve(m3, (1,))

   518         lines = _resolve(m3, (1,))

   517     elif mode == b'other':

   519     elif mode == b'other':

   518         lines = _resolve(m3, (2,))

   520         lines = _resolve(m3, (2,))

   519     else:

   521     else: