Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 31165:81250d377611
merge: combine the "merge" cases in docstring table
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 27 Feb 2017 15:09:19 -0800 |
| parents | b94706a4e267 |
| children | fad5e299cfc7 |
comparison
equal
deleted
inserted
replaced
| 31164:b94706a4e267 | 31165:81250d377611 |
|---|---|
| 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 | x | 1473 * * * n n | x |
| 1474 * * n * * | ok | 1474 * * n * * | ok |
| 1475 n n y n y | merge | 1475 n n y * y | merge |
| 1476 n n y y n | (2) | 1476 n n y y n | (2) |
| 1477 n n y y y | merge | |
| 1478 n y y * * | discard | 1477 n y y * * | discard |
| 1479 y n y * * | (3) | 1478 y n y * * | (3) |
| 1480 | 1479 |
| 1481 x = can't happen | 1480 x = can't happen |
| 1482 * = don't-care | 1481 * = don't-care |