facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity

merge: combine the two "can't happen" cases in docstring table

Browse Source
This commit is contained in:
Martin von Zweigbergk 2017-02-27 15:02:36 -08:00
parent 2b1e4cc1c6
commit 2230022a53
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mercurial/merge.py
View File

@ -1470,10 +1470,9 @@ def update(repo, node, branchmerge, force, ancestor=None,
-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