author | mpm@selenic.com |
Wed, 11 May 2005 09:44:12 -0800 | |
changeset 48 | 9f64181ff9a9 |
parent 47 | 45cc818f2445 |
child 49 | 14bff5d8e526 |
mercurial/hg.py | file | annotate | diff | comparison | revisions |
--- a/mercurial/hg.py Tue May 10 23:33:19 2005 -0800 +++ b/mercurial/hg.py Wed May 11 09:44:12 2005 -0800 @@ -33,7 +33,7 @@ """resolve unmerged heads in our DAG""" if old == new: return None a = self.ancestor(old, new) - if old == a: return new + if old == a: return None return self.merge3(old, new, a, transaction, link) def merge3(self, my, other, base, transaction, link):