Mercurial > hg
view tests/test-cat @ 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 | 991f7518c3f3 |
children |
line wrap: on
line source
#!/bin/sh # mkdir t cd t hg init echo 0 > a echo 0 > b hg ci -A -m m -d "1000000 0" hg rm a hg cat a hg cat --decode a # more tests in test-encode echo 1 > b hg ci -m m -d "1000000 0" echo 2 > b hg cat -r 0 a hg cat -r 0 b hg cat -r 1 a hg cat -r 1 b