merge: make test for fast-forward merge stricter (
issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
Fixed calling the merge script and reporting errors in debuginstall (
issue617)
Fix revlog.children so the real children of the null revision can be calculated.