diff mercurial/merge.py @ 8941:37a9d551346c

addremove: drop some silly variable assignments
author Matt Mackall <mpm@selenic.com>
date Tue, 23 Jun 2009 17:51:51 -0500
parents ab668c92a036
children 3f56055ff1d7
line wrap: on
line diff