tests/test-lock-badness.out

commands: explain when to use resolve -m

adding a
updating working directory
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