diff mercurial/simplemerge.py @ 13768:10aea25fb519

revlog: change variable name to avoid reuse
author Matt Mackall <mpm@selenic.com>
date Sat, 26 Mar 2011 17:12:02 -0500
parents 4cdaf1adafc8
children d13913355390 3c65cdcf3ba6
line wrap: on
line diff