Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 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 | dc5920ea12f8 |
children | 8808ea7da86b |
comparison
equal
deleted
inserted
replaced
4720:72fb6f10fac1 | 4721:96614af3c679 |
---|