Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: move "incompatible options" case first in docstring table
authorMartin von Zweigbergk <martinvonz@google.com>
Mon, 27 Feb 2017 15:00:13 -0800
changeset 31161 351207bfdde9
parent 31160 487ec7b096e2
child 31162 e72ed22713ab
merge: move "incompatible options" case first in docstring table
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Mon Feb 27 14:58:53 2017 -0800
+++ b/mercurial/merge.py	Mon Feb 27 15:00:13 2017 -0800
@@ -1469,23 +1469,23 @@
     This logic is tested by test-update-branches.t.
 
     -c  -C  dirty  rev  linear  |  result
+     y   y    *     *     *     |    (1)
      n   n    n     n     n     |     x
      n   n    n     n     y     |    ok
      n   n    n     y     *     |    ok
      n   n    y     n     n     |     x
      n   n    y     n     y     |   merge
-     n   n    y     y     n     |    (1)
+     n   n    y     y     n     |    (2)
      n   n    y     y     y     |   merge
      n   y    *     *     *     |  discard
-     y   n    y     *     *     |    (2)
+     y   n    y     *     *     |    (3)
      y   n    n     *     *     |    ok
-     y   y    *     *     *     |    (3)
 
     x = can't happen
     * = don't-care
-    1 = abort: uncommitted changes (commit or update --clean to discard changes)
-    2 = abort: uncommitted changes (checked in commands.py)
-    3 = incompatible options (checked in commands.py)
+    1 = incompatible options (checked in commands.py)
+    2 = abort: uncommitted changes (commit or update --clean to discard changes)
+    3 = abort: uncommitted changes (checked in commands.py)
 
     Return the same tuple as applyupdates().
     """
mercurial