Mercurial > hg
view tests/test-merge4.out @ 3862:46abbed02b2d
Use UTF-8 in .hg/branch
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sun, 10 Dec 2006 20:35:28 -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)