Mercurial > hg-stable
view hg @ 5172:f53d97d651f4
Use smerge minor mode in emacs to resolve conflicts.
The condition-case is used to suppress errors with emacs versions before 21.
author | Sascha Wilde <wilde@sha-bang.de> |
---|---|
date | Wed, 15 Aug 2007 17:27:51 +0200 |
parents | 63b9d2deed48 |
children | 18a9fbb5cd78 |
line wrap: on
line source
#!/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. import mercurial.commands mercurial.commands.run()