diff tests/test-merge5.out @ 3550:eda9e7c9300d

New UnexpectedOutput exception to catch server errors in localrepo.stream_in If the unexpected is a string, the empty string will be mentioned, and long strings are cut to at most 400 chars.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 27 Oct 2006 18:17:12 +0200
parents 49988d9f0758
children 41989e55fa37
line wrap: on
line diff