Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 4593:2937d0dbfab0
Make --import-branch option actually work (- is translated to _)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 17 Jun 2007 14:11:30 +0200 |
parents | 0912d8df5e19 |
children | 66ed92ed115a |