Mercurial > hg > pyhgsh
view hg @ 1495:1e265c2bec94
Deal with merge abort more gracefully
We save parent info last rather than first.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 02 Nov 2005 20:22:29 -0800 |
parents | 03f27b1381f9 |
children | ad4a2eefe4d7 |
line wrap: on
line source
#!/usr/bin/env python # # mercurial - a minimal scalable distributed SCM # v0.6 "paola" # # Copyright 2005 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()