Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3886:abaee83ce0a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace demandload with new demandimport
author Matt Mackall <mpm@selenic.com>
date Wed, 13 Dec 2006 13:27:09 -0600
parents 1e0b94cfba0e
children 6b4127c7d52a
comparison
equal deleted inserted replaced
3885:1e0b94cfba0e 3886:abaee83ce0a6
5 # This software may be used and distributed according to the terms 5 # This software may be used and distributed according to the terms
6 # of the GNU General Public License, incorporated herein by reference. 6 # of the GNU General Public License, incorporated herein by reference.
7 7
8 from node import * 8 from node import *
9 from i18n import gettext as _ 9 from i18n import gettext as _
10 from demandload import * 10 import errno, util, os, tempfile
11 demandload(globals(), "errno util os tempfile")
12 11
13 def filemerge(repo, fw, fo, wctx, mctx): 12 def filemerge(repo, fw, fo, wctx, mctx):
14 """perform a 3-way merge in the working directory 13 """perform a 3-way merge in the working directory
15 14
16 fw = filename in the working directory 15 fw = filename in the working directory