Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge5.out @ 2963:a8546e40070a
fix incoming -p
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sun, 20 Aug 2006 02:21:51 -0300 |
parents | 49988d9f0758 |
children | 41989e55fa37 |