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

diff -r b94706a4e267 -r 81250d377611 mercurial/merge.py
--- a/mercurial/merge.py	Mon Feb 27 15:07:01 2017 -0800
+++ b/mercurial/merge.py	Mon Feb 27 15:09:19 2017 -0800
@@ -1472,9 +1472,8 @@
      y   y    *     *     *     |    (1)
      *   *    *     n     n     |     x
      *   *    n     *     *     |    ok
-     n   n    y     n     y     |   merge
+     n   n    y     *     y     |   merge
      n   n    y     y     n     |    (2)
-     n   n    y     y     y     |   merge
      n   y    y     *     *     |  discard
      y   n    y     *     *     |    (3)