diff mercurial/localrepo.py @ 1389:9b3ef6f3cef5

convert-repo: fix up octopus merge conversion
author Matt Mackall <mpm@selenic.com>
date Wed, 05 Oct 2005 19:27:35 -0700
parents d729850d52fa
children 3f76ac60130d 518da3c3b6ce
line wrap: on
line diff