Mercurial > hg

comparison mercurial/merge.py @ 10263:25e572394f5c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update license to GPLv2+
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Jan 2010 22:20:08 -0600
parents ee00ef6f9be7
children 08a0f04b56bd
comparison
equal deleted inserted replaced
10262:eb243551cbd8 10263:25e572394f5c
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 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 or any later version.
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 util, filemerge, copies, subrepo 10 import util, filemerge, copies, subrepo
11 import errno, os, shutil 11 import errno, os, shutil