Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/util.py @ 5340:ad8783fe20f7
darcs2hg: Now detects and recovers from simple darcs conflicts.
author | Terry Smith <terry@t11e.com> |
---|---|
date | Tue, 11 Sep 2007 13:13:54 -0400 |
parents | b0bc8cf41ffc |
children | 335696e2a58f 23651848d638 |
comparison
equal
deleted
inserted
replaced
5339:b62a59fa9d26 | 5340:ad8783fe20f7 |
---|