simplemerge: remove now-unused `localorother` argument from `merge_lines()`

Differential Revision: https://phab.mercurial-scm.org/D11902

mercurial/simplemerge.py

@@ -96,7 +96,6 b' class Merge3Text(object):'
         mid_marker=b'=======',
         end_marker=b'>>>>>>>',
         base_marker=None,
-        localorother=None,
         minimize=False,
     ):
         """Return merge in cvs-like form."""
@@ -128,13 +127,6 b' class Merge3Text(object):'
                 for i in range(t[1], t[2]):
                     yield self.b[i]
             elif what == b'conflict':
-                if localorother == b'local':
-                    for i in range(t[3], t[4]):
-                        yield self.a[i]
-                elif localorother == b'other':
-                    for i in range(t[5], t[6]):
-                        yield self.b[i]
-                else:
                     self.conflicts = True
                     if start_marker is not None:
                         yield start_marker + newline