# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1263075408 -3600
# Node ID e3e41e5e7ff4c8625e6e6ef434dae06e7ab5489a
# Parent  51421ab573deb8a85085371f746fe64c565b8ad1# Parent  6521605bc2007750e57895d8ba0b3f02a83b1df0
Merge with stable

diff -r 51421ab573de -r e3e41e5e7ff4 hgext/relink.py
--- a/hgext/relink.py	Sat Jan 09 10:47:47 2010 +0100
+++ b/hgext/relink.py	Sat Jan 09 23:16:48 2010 +0100
@@ -48,7 +48,7 @@
     try:
         remotelock = src.lock()
         try:
-            candidates = collect(src.store.path, ui)
+            candidates = sorted(collect(src.store.path, ui))
             targets = prune(candidates, src.store.path, repo.store.path, ui)
             do_relink(src.store.path, repo.store.path, targets, ui)
         finally:
diff -r 51421ab573de -r e3e41e5e7ff4 mercurial/commands.py
--- a/mercurial/commands.py	Sat Jan 09 10:47:47 2010 +0100
+++ b/mercurial/commands.py	Sat Jan 09 23:16:48 2010 +0100
@@ -2443,7 +2443,7 @@
     will be overwritten if the merge is retried with resolve. The
     -m/--mark switch should be used to mark the file as resolved.
 
-    You can specify a set of files to operate on, or use the -a/-all
+    You can specify a set of files to operate on, or use the -a/--all
     switch to select all unresolved files.
 
     This command also allows listing resolved files and manually