diff tests/test-bad-pull @ 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 e3a0c092b4e2
children 490e40816cbd
line wrap: on
line diff