diff mercurial/mpatch.c @ 3407:d2b55e3c4e25

merge: if filemerge skips merge, report as updated
author Matt Mackall <mpm@selenic.com>
date Sun, 15 Oct 2006 16:18:09 -0500
parents cc856c4d91ca
children 95ffa36d1d2a 11dc22eb8e8d
line wrap: on
line diff