tests/test-merge4.out
author Patrick Mezard <pmezard@gmail.com>
Thu, 09 Aug 2007 23:14:50 +0200
changeset 5089 9b5ae133bd5a
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
test-no-symlinks: rename .bundle into .hg for consistency.

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