Remove unnecessary escapes from diff/merge tool cmds