Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 4590:80fb4ec512b5
convert: fix various authormap handling bugs
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 14 Jun 2007 16:12:08 -0700 |
parents | 0912d8df5e19 |
children | 66ed92ed115a |