diff tests/test-symlinks.out @ 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 9d1c3529ebbc
children d7b9ec589546
line wrap: on
line diff