Mercurial > hg
view tests/test-merge4.out @ 3077:ad6aecaf4eed
document changelog format
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 09 Sep 2006 12:56:08 +0200 |
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)