diff mercurial/localrepo.py @ 3234:cac7be0b9b99

merge: remove old merge function
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Oct 2006 12:06:33 -0500
parents ff15ba23c1cf
children 53e843840349 8d4855fd9d7b
line wrap: on
line diff