diff mercurial/merge.py @ 14321:003d63bb4fa5

scmutil: drop some aliases in cmdutil
author Matt Mackall <mpm@selenic.com>
date Fri, 13 May 2011 14:48:48 -0500
parents df2399663392
children ae1f7a5373e8
line wrap: on
line diff