Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3786:6398ff7cb705
age | author | description |
---|---|---|
Mon, 04 Dec 2006 17:10:31 -0600 | Matt Mackall | imported patch collision |
Sun, 03 Dec 2006 16:16:33 -0600 | Matt Mackall | Handle transcoding of branch names |