Mercurial > hg
diff mercurial/simplemerge.py @ 12401:4cdaf1adafc8
backout most of 4f8067c94729
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 24 Sep 2010 12:46:54 -0500 |
| parents | 4f8067c94729 |
| children | d13913355390 3c65cdcf3ba6 |
line wrap: on
line diff
--- a/mercurial/simplemerge.py Fri Sep 24 12:00:55 2010 +0200 +++ b/mercurial/simplemerge.py Fri Sep 24 12:46:54 2010 -0500 @@ -110,7 +110,7 @@ if what == 'unchanged': for i in range(t[1], t[2]): yield self.base[i] - elif what in ('a', 'same'): + elif what == 'a' or what == 'same': for i in range(t[1], t[2]): yield self.a[i] elif what == 'b': @@ -142,7 +142,7 @@ if what == 'unchanged': for i in range(t[1], t[2]): yield 'u | ' + self.base[i] - elif what in ('a', 'same'): + elif what == 'a' or what == 'same': for i in range(t[1], t[2]): yield what[0] + ' | ' + self.a[i] elif what == 'b': @@ -181,7 +181,7 @@ what = t[0] if what == 'unchanged': yield what, self.base[t[1]:t[2]] - elif what in ('a', 'same'): + elif what == 'a' or what == 'same': yield what, self.a[t[1]:t[2]] elif what == 'b': yield what, self.b[t[1]:t[2]]