view tests/test-lock-badness.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 b2ae81a7df29
children 0750f11152fe
line wrap: on
line source

adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
pushing to ../a
abort: could not lock repository ../a: Permission denied