diff tests/test-keyword.out @ 6672:6004eedb13f4

keyword: mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message
author Christian Ebert <blacktrash@gmx.net>
date Thu, 12 Jun 2008 02:27:06 +0200
parents 01e95d4bc66c
children e64f5abb8a88
line wrap: on
line diff
--- a/tests/test-keyword.out	Fri Jun 13 17:29:10 2008 -0500
+++ b/tests/test-keyword.out	Thu Jun 12 02:27:06 2008 +0200
@@ -350,7 +350,7 @@
 % kwexpand a
 overwriting a expanding keywords
 % kwexpand x/a should abort
-abort: outstanding uncommitted changes in given files
+abort: outstanding uncommitted changes
 x/a
  x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
 overwriting x/a expanding keywords