diff mercurial/cmdutil.py @ 3003:cbb90f4bafb0

merge: eliminate usage of m1 after working manifest creation
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 17:20:09 -0500
parents ff3ea21a981a
children bc3fe3b5b785
line wrap: on
line diff