Mercurial > hg-stable

changeset 31172:e72ed22713ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: combine the two "can't happen" cases in docstring table
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 27 Feb 2017 15:02:36 -0800
parents 351207bfdde9
children f21a77fe7637
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Feb 27 15:00:13 2017 -0800
+++ b/mercurial/merge.py	Mon Feb 27 15:02:36 2017 -0800
@@ -1470,10 +1470,9 @@
 
     -c  -C  dirty  rev  linear  |  result
      y   y    *     *     *     |    (1)
-     n   n    n     n     n     |     x
+     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     |    (2)
      n   n    y     y     y     |   merge