Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 5306:7256cc396bbf
convert: workaround for cvsps.cache under Windows
In non-cygwin environment, cvsps fails to create its cache directory and redirect its output to stderr. Just ignore the error and capture stderr as well.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 14 Sep 2007 22:17:53 +0200 |
parents | ad6b97132b81 |
children | 4ed58fe4fe13 f9b0e4f023c4 |