check-code: add --nolineno option for hiding line numbers This makes the output more stable when it is used as a whitelist.

merge: give a special message for internal:merge failure (issue3105)

setup: raise when executing with python3 without c2to3 argument

posix: fix findexe() to check for file type and access

subrepo: use correct paths for subrepos with ..-relative paths on windows posixpath normpath of c:\foo\bar/../baz is baz, so now we pconvert first.

add missing localization markup