diff mercurial/merge.py @ 3896:070628929e1f

Fix setup.py warning
author Matt Mackall <mpm@selenic.com>
date Fri, 15 Dec 2006 01:17:04 -0600
parents 6b4127c7d52a
children 656e06eebda7
line wrap: on
line diff