diff tests/test-import.out @ 5757:c5793dada959

Clarify some messages during commit: - use "branch 'foo'" to distinguish from "branch merge". - commit messags can be empty (to abort commits) - Added value for editor message: Tell about HG: lines like CVS does.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 28 Dec 2007 17:10:25 +0100
parents 75c2071385da
children deb0d3518674
line wrap: on
line diff
--- a/tests/test-import.out	Fri Dec 28 16:32:14 2007 +0100
+++ b/tests/test-import.out	Fri Dec 28 17:10:25 2007 +0100
@@ -22,7 +22,7 @@
 applying ../tip.patch
 transaction abort!
 rollback completed
-abort: commit message cannot be left blank
+abort: empty commit message
 % import of plain diff should be ok with message
 requesting all changes
 adding changesets
@@ -92,7 +92,7 @@
 applying patch from stdin
 transaction abort!
 rollback completed
-abort: commit message cannot be left blank
+abort: empty commit message
 % hg export in email, should use patch header
 requesting all changes
 adding changesets