Mercurial > hg-stable

changeset 31174:b94706a4e267

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: combine "dirty" cases in docstring table
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 27 Feb 2017 15:07:01 -0800
parents f21a77fe7637
children 81250d377611
files mercurial/merge.py
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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