Mercurial > hg

view tests/test-merge4.out @ 6101:abb1c451a88e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Define tla username locally in baz and tla tests Suggested by Alexis S. L. Carvalho.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 13 Feb 2008 00:40:18 +0100
parents b2ae81a7df29
children 4b0c9c674707
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)