view hg @ 1797:42f75cd04bf4

Fix hgmerge: mkdir "'/tmp'/hgmerge..." and ask_if_merged() didn't work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 23 Feb 2006 14:42:47 +0100
parents ad4a2eefe4d7
children abaee83ce0a6
line wrap: on
line source

#!/usr/bin/env python
#
# mercurial - scalable distributed SCM
#
# Copyright 2005, 2006 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()