comparison mercurial/context.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 69fe021cc23e
children d8eba1c3ce9b cc9c31b07c2c
comparison
equal deleted inserted replaced
3399:5dbb3a991bbf 3407:d2b55e3c4e25