author | Thomas Arendsen Hein <thomas@intevation.de> |
Sun, 17 Jun 2007 14:11:30 +0200 | |
changeset 4593 | 2937d0dbfab0 |
parent 4592 | 5243cece3d97 |
child 4597 | ec431334e4fc |
--- a/mercurial/commands.py Thu Jun 14 09:01:51 2007 -0700 +++ b/mercurial/commands.py Sun Jun 17 14:11:30 2007 +0200 @@ -1522,7 +1522,7 @@ repo.dirstate.setparents(p1, p2) except hg.RepoError: pass - if opts.get('exact') or opts.get('import-branch'): + if opts.get('exact') or opts.get('import_branch'): repo.dirstate.setbranch(branch or 'default') files = {}