diff tests/test-merge-revert @ 3400: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 890e285c52a1
children 9dcf9d45cab8
line wrap: on
line diff