Mercurial > hg > mercurial-crew-with-dirclash

view hg @ 3869:ad6f34c83c3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 11 Dec 2006 18:09:52 +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()