Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 31175:81250d377611

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: combine the "merge" cases in docstring table
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 27 Feb 2017 15:09:19 -0800
parents b94706a4e267
children fad5e299cfc7
line wrap: on
line diff
--- 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)