diff mercurial/ui.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 2d428b859282
children 3de4f17f4824
line wrap: on
line diff