diff mercurial/pure/bdiff.py @ 8734:60fa3371aa75

merge: pretend ancestor is local to simplify backwards and overwrite
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 46293a0c7e9f
children 25e572394f5c
line wrap: on
line diff