log tests/test-merge-prompt.t @ 15799:e43c140eb08f stable

age author description
Tue, 21 Sep 2010 16:00:02 -0500 Matt Mackall tests: cleanup exit code handling in unified tests
Fri, 17 Sep 2010 17:03:08 -0500 Matt Mackall tests: fix a bunch of pointless #s in unified tests
Sun, 12 Sep 2010 11:52:13 +0200 Adrian Buehlmann tests: unify test-merge-prompt base tests/test-merge-prompt@1bfb1731b874