Mercurial > hg

comparison mercurial/merge.py @ 4635:63b9d2deed48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated copyright notices and add "and others" to "hg version"
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 19 Jun 2007 08:51:34 +0200
parents ff7253a0d1da
children 723e0ddb6ada
comparison
equal deleted inserted replaced
4634:73bf2b586f3f 4635:63b9d2deed48
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 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
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 *