view tests/test-merge5.out @ 1139:916bb2849c4c

Reverted change 51f26e856f3d: Reading changelogs is too slow.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 29 Aug 2005 07:07:07 +0200
parents 5a034646e472
children ced2d3620f95
line wrap: on
line source

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)