Mercurial > hg > mercurial-crew-with-dirclash
view hg @ 4360:d5c3a70f8422
polish the simplemerge command; add a test
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 16 Apr 2007 20:17:39 -0300 |
parents | abaee83ce0a6 |
children | 63b9d2deed48 |
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. import mercurial.commands mercurial.commands.run()