annotate mercurial/__init__.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 9117c6561b0b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source