Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/merge.py @ 3578:3b4e00cba57a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Define and use nullrev (revision of nullid) instead of -1.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 29 Oct 2006 10:53:51 +0100
parents 798bcde0c9c2
children 41989e55fa37
line wrap: on
line diff
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -34,7 +34,7 @@ def filemerge(repo, fw, fo, wctx, mctx):
 
     fca = fcm.ancestor(fco)
     if not fca:
-        fca = repo.filectx(fw, fileid=-1)
+        fca = repo.filectx(fw, fileid=nullrev)
     a = repo.wjoin(fw)
     b = temp("base", fca)
     c = temp("other", fco)