# HG changeset patch
# User mpm@selenic.com
# Date 1115833452 28800
# Node ID 9f64181ff9a9e80c6033f9784b66f551af7c7d24
# Parent  45cc818f2445fc3a7358c3465170cb40410db9ff
Fix resolve bug putting unchanged files in resolve cset



diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -33,7 +33,7 @@ class filelog(revlog):
         """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):