diff mercurial/commands.py @ 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 55476ce8e59c
children a004164dbeef 52617d992eed
line wrap: on
line diff