# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1488236821 28800
# Node ID b94706a4e2672afc7f32b7253f49014a2078b59f
# Parent  f21a77fe76375d2b094a62166b40b9124bde5397
merge: combine "dirty" cases in docstring table

diff -r f21a77fe7637 -r b94706a4e267 mercurial/merge.py
--- a/mercurial/merge.py	Mon Feb 27 15:29:34 2017 -0800
+++ b/mercurial/merge.py	Mon Feb 27 15:07:01 2017 -0800
@@ -1471,14 +1471,12 @@
     -c  -C  dirty  rev  linear  |  result
      y   y    *     *     *     |    (1)
      *   *    *     n     n     |     x
-     n   n    n     n     y     |    ok
-     n   n    n     y     *     |    ok
+     *   *    n     *     *     |    ok
      n   n    y     n     y     |   merge
      n   n    y     y     n     |    (2)
      n   n    y     y     y     |   merge
-     n   y    *     *     *     |  discard
+     n   y    y     *     *     |  discard
      y   n    y     *     *     |    (3)
-     y   n    n     *     *     |    ok
 
     x = can't happen
     * = don't-care