Mercurial > hg
view tests/test-merge4.out @ 6404:f08662abdf3f
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 29 Mar 2008 21:15:54 +0100 |
parents | 4b0c9c674707 |
children |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)