I\'m trying to resolve merge conflicts using vimdiff from a merge request made with hglib-python. When I specify the mergetool as vimdiff, the process will hang. I\'ve had n
