tests/test-lock-badness.out

localrepo.update: abort if outstanding merges, instead of warn/return 1

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