diff mercurial/posix.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 3fa92c618624
children 0289f384e1e5
line wrap: on
line diff