Mercurial > hg
comparison mercurial/merge.py @ 31162:e72ed22713ab
merge: combine the two "can't happen" cases in docstring table
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 27 Feb 2017 15:02:36 -0800 |
parents | 351207bfdde9 |
children | f21a77fe7637 |
comparison
equal
deleted
inserted
replaced
31161:351207bfdde9 | 31162:e72ed22713ab |
---|---|
1468 | 1468 |
1469 This logic is tested by test-update-branches.t. | 1469 This logic is tested by test-update-branches.t. |
1470 | 1470 |
1471 -c -C dirty rev linear | result | 1471 -c -C dirty rev linear | result |
1472 y y * * * | (1) | 1472 y y * * * | (1) |
1473 n n n n n | x | 1473 n n * n n | x |
1474 n n n n y | ok | 1474 n n n n y | ok |
1475 n n n y * | ok | 1475 n n n y * | ok |
1476 n n y n n | x | |
1477 n n y n y | merge | 1476 n n y n y | merge |
1478 n n y y n | (2) | 1477 n n y y n | (2) |
1479 n n y y y | merge | 1478 n n y y y | merge |
1480 n y * * * | discard | 1479 n y * * * | discard |
1481 y n y * * | (3) | 1480 y n y * * | (3) |