view tests/test-diff-copy-depth.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.

-- With aaa
Status:
A somename
  other-file

Diff:
diff --git a/other-file b/somename
copy from other-file
copy to somename

-- With zzz
Status:
A somename
  other-file

Diff:
diff --git a/other-file b/somename
copy from other-file
copy to somename