Mercurial > hg
view tests/test-addremove.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 | 03916abdfb64 |
children | 627399330c7d |
line wrap: on
line source
adding dir/bar adding foo dir/bar foo committed changeset 0:d44511117907 adding dir/bar_2 adding foo_2 dir/bar_2 foo_2 committed changeset 1:a85812e0561a adding a adding c removing a adding b removing c adding d recording removal of a as rename to b (100% similar)