log tests/test-merge-prompt @ 6404:f08662abdf3f

age author description
Thu, 27 Dec 2007 13:39:03 +0100 Thomas Arendsen Hein Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)