view en/examples/branch-repo.merge.out @ 431:d13a05515acf

Fixing problem on bisect that inhibits building with mercurial 1.0 or later

$ \textbf{hg merge}
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'}
$ \textbf{hg push}
pushing to 
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files