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.
public attribute not declared in interfaces: badpeer.badattributepublic attribute not declared in interfaces: badpeer.badmethod