Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge1.out @ 4721:96614af3c679
convert: "unknown" is a string
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 25 Jun 2007 18:52:12 -0300 |
parents | 3109f012c305 |
children |