5 Commits

Author	SHA1	Message	Date
Mads Kiilerich	2ec21b22f5	merge: don't indent "local changed %s which remote deleted" prompt ... It was usually not shown in a context where indentation helped readability and it was inconsistent with other prompts.	2013-02-04 02:46:53 +01:00
Mads Kiilerich	637e2ecde2	tests: hide 'No such file or directory' messages ... Windows will use a different and localized message.	2011-11-16 03:45:14 +01:00
Matt Mackall	ac660e9f65	tests: cleanup exit code handling in unified tests	2010-09-21 16:00:02 -05:00
Matt Mackall	200e89394d	tests: fix a bunch of pointless #s in unified tests	2010-09-17 17:03:08 -05:00
Adrian Buehlmann	9e07266e5a	tests: unify test-merge-prompt	2010-09-12 11:52:13 +02:00