log tests/test-merge-prompt.out @ 6219:d43c94414ba1

age author description
Mon, 31 Dec 2007 17:47:02 -0600 Matt Mackall Backed out changeset c2a21fe60994
Sun, 30 Dec 2007 17:45:26 +0100 Thomas Arendsen Hein "C" status code considered harmful, so changed to "=" (issue899)
Thu, 27 Dec 2007 13:39:03 +0100 Thomas Arendsen Hein Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)