diff mercurial/commands.py @ 3111:40e777bda455

merge: remove linear variable
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 17:13:02 -0500
parents 25857e00af8e
children 81da3c45aabd
line wrap: on
line diff