view tests/test-simplemerge-cmd.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 ea7b982b6c08
children e1f4343db740
line wrap: on
line source

(binary:application/octet-stream)