# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1151947711 -7200
# Node ID bb403d427974c0d49694e2332463033a6a56e50f
# Parent  764a54eb8c5a155dc735bf9013b363c30fcf0a6f
Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)

diff -r 764a54eb8c5a -r bb403d427974 tests/test-up-local-change.out
--- a/tests/test-up-local-change.out	Mon Jul 03 10:19:09 2006 -0700
+++ b/tests/test-up-local-change.out	Mon Jul 03 19:28:31 2006 +0200
@@ -43,7 +43,7 @@
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
-abort: there is nothing to merge, just use 'hg update'
+abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'
 failed
 changeset:   0:33aaa84a386b
 user:        test