view hg @ 1885:c4d577262d00

run merge program in repo root. before, merge program was run in user current directory. Well defined location is better for scripts. no more need to pass HG_ROOT to merge program now.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sat, 11 Mar 2006 21:33:19 -0800
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()