diff mercurial/filesetlang.py @ 42441: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 e79a69af1593
children 2372284d9457
line wrap: on
line diff