Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 8225:46293a0c7e9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated license to be explicit about GPL version 2
author Martin Geisler <mg@lazybytes.net>
date Sun, 26 Apr 2009 01:08:54 +0200
parents 08e1baf924ca
children 98acfd1d2b08
comparison
equal deleted inserted replaced
8224:1075f5c1b3fa 8225:46293a0c7e9f
1 # merge.py - directory-level update/merge handling for Mercurial 1 # merge.py - directory-level update/merge handling for Mercurial
2 # 2 #
3 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com> 3 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
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 of the
6 # of the GNU General Public License, 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 errno, util, os, filemerge, copies, shutil
11 11