Mercurial > hg

diff tests/test-merge-force.out @ 8545:3682a19bb637

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: give hint as to how to discover uncommitted changes Many users will try 'hg diff' here, and it will not show them missing files.
author Steve Borho <steve@borho.org>
date Fri, 22 May 2009 11:42:21 -0500
parents 4b0c9c674707
children
line wrap: on
line diff
--- a/tests/test-merge-force.out	Fri May 22 18:57:53 2009 +0200
+++ b/tests/test-merge-force.out	Fri May 22 11:42:21 2009 -0500
@@ -1,6 +1,6 @@
 created new head
 % local deleted a file, remote removed
-abort: outstanding uncommitted changes
+abort: outstanding uncommitted changes (use 'hg status' to list changes)
 resolving manifests
 removing a
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved