Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 5453:9d77f2b47eb7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix UnboundLocalError, refactor a bit bin wasn't defined in all branches (bug introduced in 82b4ff3abbcd
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 11 Oct 2007 12:16:55 +0200
parents b2ae81a7df29
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)