log tests/test-merge-prompt.t @ 25631:2748bf78a5bf

age author description
Wed, 01 Oct 2014 01:04:18 +0200 Mads Kiilerich ui: show prompt choice if input is not a tty but is forced to be interactive
Mon, 04 Feb 2013 02:46:53 +0100 Mads Kiilerich merge: don't indent "local changed %s which remote deleted" prompt
Wed, 16 Nov 2011 03:45:14 +0100 Mads Kiilerich tests: hide 'No such file or directory' messages
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