diff mercurial/merge.py @ 3412:f2de6b6bc57a

imported patch b1
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 18:01:14 -0500
parents d2b55e3c4e25
children ef2e990f9047
line wrap: on
line diff