tests/test-merge4.out
author Patrick Mezard <pmezard@gmail.com>
Mon, 10 May 2010 22:46:16 +0200
changeset 11141 df5d1d571d27
parent 6336 4b0c9c674707
permissions -rw-r--r--
tests: force color ansi mode on Windows

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)