Mercurial > hg > gitweb
view tests/test-merge4.out @ 3749:f9567a7fa3b3
additional fixes for issue436
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 01 Dec 2006 16:18:16 -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)