tests/test-merge4.out
author Martin Geisler <mg@lazybytes.net>
Sun, 15 Aug 2010 17:42:44 +0200
changeset 11883 01e04df696e3
parent 6336 4b0c9c674707
permissions -rw-r--r--
test-init: replace 'echo -n' with 'printf' The '-n' argument to echo is a non-standard extension that isn't supported on Mac OS X 10.6.

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)