view tests/test-merge4.out @ 5283:4fe04b183fd8

Forgot to quote "6^" in test-parentrevspec (see 94e77a174f55)
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 04 Sep 2007 18:37:28 +0200
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

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)