[PATCH 07 of 11 V5] merge: combine "dirty" cases in docstring table
Martin von Zweigbergk
martinvonz at google.com
Mon Feb 27 19:31:24 EST 2017
# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1488236821 28800
# Mon Feb 27 15:07:01 2017 -0800
# Node ID 77edbed1c44886a45c4f398cdabd0f463a6c1c38
# Parent 5fe59a06b365dcb9c399ffbb0b64d985b53f2745
merge: combine "dirty" cases in docstring table
diff -r 5fe59a06b365 -r 77edbed1c448 mercurial/merge.py
--- 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
More information about the Mercurial-devel
mailing list