comparison contrib/mercurial.spec @ 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 e5c8e38b788f
children 1ef8ada4370f
comparison
equal deleted inserted replaced
3399:5dbb3a991bbf 3407:d2b55e3c4e25