Mercurial > public > mercurial-scm > hg

diff mercurial/hg.py @ 48:9f64181ff9a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix resolve bug putting unchanged files in resolve cset
author mpm@selenic.com
date Wed, 11 May 2005 09:44:12 -0800
parents 93e868fa0db8
children 2add70d51441
line wrap: on
line diff
--- 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):