.cvsignore
author Jan Vrany <jan.vrany@fit.cvut.cz>
Thu, 23 Aug 2018 10:44:42 +0100
changeset 859 d990a97b26a4
parent 484 48e17860aaa0
permissions -rw-r--r--
Fix parsing og `hg merge` output for Mercurial 4.6 and newer In Mercurial 4.6 the wording of last line of the output has changed. This commit updates the parser so it can handle both wordings.

*.sth
*.STH
*.c
*.sc
objbc
objvc
objmingw
*.res