view tests/test-cat.out @ 5672:8a65ea986755

Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 27 Dec 2007 13:39:03 +0100
parents 7544700fd931
children f5b00b6e426a
line wrap: on
line source

adding a
adding b
0
0
0
a: No such file in rev 03f6b0774996
1