Patchwork [05,of,11,V5] merge: combine the two "can't happen" cases in docstring table

login
register
mail settings
Submitter via Mercurial-devel
Date Feb. 28, 2017, 12:31 a.m.
Message ID <e1f1afc6f1c31748077d.1488241882@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/18823/
State Accepted
Headers show

Comments

via Mercurial-devel - Feb. 28, 2017, 12:31 a.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1488236556 28800
#      Mon Feb 27 15:02:36 2017 -0800
# Node ID e1f1afc6f1c31748077da2abe2a7b613eef17914
# Parent  658aa233506c722935c640eb3b46fc2176f5df58
merge: combine the two "can't happen" cases in docstring table

Patch

diff -r 658aa233506c -r e1f1afc6f1c3 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