diff hgmerge @ 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 f53d97d651f4
children 3c80ecdc1bcd
line wrap: on
line diff