Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3893:6b4127c7d52a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify i18n imports
author Matt Mackall <mpm@selenic.com>
date Thu, 14 Dec 2006 20:25:19 -0600
parents abaee83ce0a6
children 656e06eebda7
comparison
equal deleted inserted replaced
3892:2eec996f2fb9 3893:6b4127c7d52a
4 # 4 #
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 _
10 import errno, util, os, tempfile 10 import errno, util, os, tempfile
11 11
12 def filemerge(repo, fw, fo, wctx, mctx): 12 def filemerge(repo, fw, fo, wctx, mctx):
13 """perform a 3-way merge in the working directory 13 """perform a 3-way merge in the working directory
14 14