Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 6211:f89fd07fc51d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Expand import * to allow Pyflakes to find problems
author Joel Rosdahl <joel@rosdahl.net>
date Thu, 06 Mar 2008 22:23:26 +0100
parents 7855b88ba838
children a375ffc2aa1b
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Mar 07 00:24:36 2008 +0100
+++ b/mercurial/merge.py	Thu Mar 06 22:23:26 2008 +0100
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from node import *
+from node import nullid, nullrev
 from i18n import _
 import errno, util, os, heapq, filemerge