# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1488236556 28800
# Node ID e72ed22713ab68e9030527553e5a391afefc1b67
# Parent  351207bfdde9d8b4e3d527c4f15cc780c025873b
merge: combine the two "can't happen" cases in docstring table

diff -r 351207bfdde9 -r e72ed22713ab mercurial/merge.py
--- 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