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