diff mercurial/commands.py @ 2998:833677bc9791

merge: rename mysterious variable
author Matt Mackall <mpm@selenic.com>
date Mon, 21 Aug 2006 14:25:56 -0500
parents eef469259745
children f63667f694de
line wrap: on
line diff