Mercurial > hg-stable

diff mercurial/merge.py @ 12279:28e2e3804f2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
combine tests
author Adrian Buehlmann <adrian@cadifra.com>
date Tue, 14 Sep 2010 12:20:51 +0200
parents ad787252fed6
children 6f0d9d79111f
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Sep 13 16:25:13 2010 +0200
+++ b/mercurial/merge.py	Tue Sep 14 12:20:51 2010 +0200
@@ -433,7 +433,7 @@
     the parent rev to the target rev (linear, on the same named
     branch, or on another named branch).
 
-    This logic is tested by test-update-branches.
+    This logic is tested by test-update-branches.t.
 
     -c  -C  dirty  rev  |  linear   same  cross
      n   n    n     n   |    ok     (1)     x