Mercurial > hg
changeset 3169:9e002614f2eb
merge: minor nullid cleanup
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 29 Sep 2006 17:50:59 -0500 |
parents | 05c588e1803d |
children | 14792adabf80 |
files | mercurial/merge.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Fri Sep 29 17:47:51 2006 -0500 +++ b/mercurial/merge.py Fri Sep 29 17:50:59 2006 -0500 @@ -380,7 +380,7 @@ p1, p2 = p2, repo.changectx(nullid) xp1, xp2 = str(p1), str(p2) - if p2.node() == nullid: xp2 = '' + if not p2: xp2 = '' repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)