diff -r 4cd2d1cc2a31 -r d639f60c8eb3 mercurial/debugcommands.py --- a/mercurial/debugcommands.py Tue Feb 20 21:37:30 2018 -0500 +++ b/mercurial/debugcommands.py Tue Feb 20 22:03:13 2018 -0500 @@ -1241,6 +1241,8 @@ editor = ui.geteditor() editor = util.expandpath(editor) editorbin = pycompat.shlexsplit(editor, posix=not pycompat.iswindows)[0] + if pycompat.iswindows and editorbin[0] == '"' and editorbin[-1] == '"': + editorbin = editorbin[1:-1] fm.write('editor', _("checking commit editor... (%s)\n"), editorbin) cmdpath = util.findexe(editorbin) fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',