hg
author Brendan Cully <brendan@kublai.com>
Thu, 23 Aug 2007 22:45:41 -0700
changeset 5223 3786ef8877d5
parent 5197 55860a45bbf2
permissions -rwxr-xr-x
imerge: add automerge flag to attempt to batch merge all conflicts

#!/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.

# enable importing on demand to reduce startup time
from mercurial import demandimport; demandimport.enable()

import mercurial.dispatch
mercurial.dispatch.run()