diff mercurial/osutil.c @ 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 b4a1b9012d96
children 3ac42ca1f3e6
line wrap: on
line diff