test-merge-tools: windows fixes
- /bin/cat does not exist, expect 'cat'
- non-interactive mode is not correctly detected in pysh, force it
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
0 files, 0 changesets, 0 total revisions
00changelog.i
requires
store
updating working directory
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
0 files, 0 changesets, 0 total revisions
00changelog.i
branch
dirstate
hgrc
requires
store