diff tests/test-globalopts @ 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 0b9ac7dfcf56
children 46280c004f22
line wrap: on
line diff