# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1488236333 28800
# Node ID 487ec7b096e21e22f300b0bde717098da161ed23
# Parent  955b3a6d3dd567f7d1641f58c50e1a7de7acd888
merge: make "linear" an input in docstring table

Instead of having two ouputs, it seem simpler to have an addition
input. This will allow further simplification.

diff -r 955b3a6d3dd5 -r 487ec7b096e2 mercurial/merge.py
--- a/mercurial/merge.py	Mon Feb 27 14:33:17 2017 -0800
+++ b/mercurial/merge.py	Mon Feb 27 14:58:53 2017 -0800
@@ -1468,15 +1468,18 @@
 
     This logic is tested by test-update-branches.t.
 
-    -c  -C  dirty  rev  |  linear   non-linear
-     n   n    n     n   |    ok         x
-     n   n    n     y   |    ok        ok
-     n   n    y     n   |   merge       x
-     n   n    y     y   |   merge      (1)
-     n   y    *     *   |   discard   discard
-     y   n    y     *   |    (2)       (2)
-     y   n    n     *   |    ok        ok
-     y   y    *     *   |    (3)       (3)
+    -c  -C  dirty  rev  linear  |  result
+     n   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     |    (1)
+     n   n    y     y     y     |   merge
+     n   y    *     *     *     |  discard
+     y   n    y     *     *     |    (2)
+     y   n    n     *     *     |    ok
+     y   y    *     *     *     |    (3)
 
     x = can't happen
     * = don't-care