view tests/test-lock-badness.out @ 7397:4c92d8971809

More verbose logging when filemerge searches for merge-tool Previously it was very hard to find out what was going on when the expected merge tool wasn't used. This patch tries to improve that. hg merge -v now shows which tools were searched for but not found.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 07 Nov 2008 02:47:12 +0100
parents 0750f11152fe
children a3d73b3e1f8a
line wrap: on
line source

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