hg
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 23 Jul 2005 17:14:05 +0100
changeset 792 49ec802b4a16
parent 515 03f27b1381f9
child 1698 ad4a2eefe4d7
permissions -rwxr-xr-x
Added tests for bug with three-way-merging of old tip, tip and cwd.

#!/usr/bin/env python
#
# mercurial - a minimal scalable distributed SCM
# v0.6 "paola"
#
# Copyright 2005 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.

from mercurial import commands

commands.run()