hg
author Matt Mackall <mpm@selenic.com>
Thu, 05 Jul 2007 13:34:18 -0500
changeset 4748 8808ea7da86b
parent 4635 63b9d2deed48
child 5178 18a9fbb5cd78
permissions -rwxr-xr-x
merge: make test for fast-forward merge stricter (issue619) don't allow merging with an ancestor fix != on contexts add a test

#!/usr/bin/env python
#
# mercurial - scalable distributed SCM
#
# Copyright 2005-2007 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.

import mercurial.commands
mercurial.commands.run()