Mercurial > hg > mercurial-crew-with-dirclash
changeset 48:9f64181ff9a9
Fix resolve bug putting unchanged files in resolve cset
author | mpm@selenic.com |
---|---|
date | Wed, 11 May 2005 09:44:12 -0800 |
parents | 45cc818f2445 |
children | 14bff5d8e526 |
files | mercurial/hg.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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):