comparison mercurial/worker.py @ 42457:43c8f72184f4

revset: fix merge() to fall back to changectx API if wdir specified I have a code which basically runs "0:wdir() & <user-revset>", and it crashed if merge() were passed in.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 09 Jun 2019 22:23:41 +0900
parents e10adebf8176
children 5ca136bbd3f6
comparison
equal deleted inserted replaced
42456:d279e4f453c4 42457:43c8f72184f4