exporting patch:
Fixed behavior of revsplit for branch names including the @-symbol.
imported patch
issue1546-hg-bisect-command-doesn-t-work-with-shell-scripts.patch
resolve: move reset to localrepo.commit
This way rebase doesn't leave a stale resolve state