Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 8312:b87a50b7125c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
separate import lines from mercurial and general python modules
author Simon Heimberg <simohe@besonet.ch>
date Tue, 28 Apr 2009 17:40:46 +0200
parents 98acfd1d2b08
children 0bf0045000b5
comparison
equal deleted inserted replaced
8311:e0eb03bfa5af 8312:b87a50b7125c
5 # This software may be used and distributed according to the terms of the 5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2, incorporated herein by reference. 6 # GNU General Public License version 2, incorporated herein by reference.
7 7
8 from node import nullid, nullrev, hex, bin 8 from node import nullid, nullrev, hex, bin
9 from i18n import _ 9 from i18n import _
10 import errno, util, os, filemerge, copies, shutil 10 import util, filemerge, copies
11 import errno, os, shutil
11 12
12 class mergestate(object): 13 class mergestate(object):
13 '''track 3-way merge state of individual files''' 14 '''track 3-way merge state of individual files'''
14 def __init__(self, repo): 15 def __init__(self, repo):
15 self._repo = repo 16 self._repo = repo