# HG changeset patch # User Christian Ebert # Date 1273827407 -7200 # Node ID 0214eb052686f676656a02aa4d78610c8bf60312 # Parent 1124280b445c8c163d20f9eff72717e81eb00304# Parent 9f46c562c4b5dd35a612162b027174d8c3384ac5 (stable) merge diff -r 9f46c562c4b5 -r 0214eb052686 tests/test-keyword.out --- a/tests/test-keyword.out Sun May 09 11:14:43 2010 +0200 +++ b/tests/test-keyword.out Fri May 14 10:56:47 2010 +0200 @@ -462,7 +462,6 @@ % test restricted mode with transplant -b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved marked working directory as branch foo -created new head 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying 4aa30d025d50 4aa30d025d50 transplanted to 5a4da427c162