tests/test-merge4.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 12 Oct 2008 19:11:59 +0200
changeset 7080 a6477aa893b8
parent 6336 4b0c9c674707
permissions -rw-r--r--
tests: Windows compatibility fixes - printenv.py, md5sum.py, simplemerge, test-archive, test-merge1, test-merge-symlinks: set standard streams to binary mode - test-encode: replace "gunzip" by "gzip -d" - test-hup: requires fifo

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)