Mercurial > hg
changeset 26821:27683c63f44c stable
merge: improve clarity of table in update docstring
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Fri, 23 Oct 2015 06:06:22 -0400 |
| parents | 71d5238f92e9 |
| children | d881c072050a |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Thu Oct 22 18:59:03 2015 +0000 +++ b/mercurial/merge.py Fri Oct 23 06:06:22 2015 -0400 @@ -1116,15 +1116,15 @@ This logic is tested by test-update-branches.t. - -c -C dirty rev | linear same cross - n n n n | ok (1) x - n n n y | ok ok ok - n n y n | merge (2) (2) - n n y y | merge (3) (3) - n y * * | --- discard --- - y n y * | --- (4) --- - y n n * | --- ok --- - y y * * | --- (5) --- + -c -C dirty rev | linear same cross + n n n n | ok (1) x + n n n y | ok ok ok + n n y n | merge (2) (2) + n n y y | merge (3) (3) + n y * * | discard discard discard + y n y * | (4) (4) (4) + y n n * | ok ok ok + y y * * | (5) (5) (5) x = can't happen * = don't-care