diff --git a/mercurial/merge.py b/mercurial/merge.py index 71d5238f92e9ab5cc6b1677d4ba48903fc939f01_bWVyY3VyaWFsL21lcmdlLnB5..27683c63f44cb58d02df2d4dc16f5ba3348d394c_bWVyY3VyaWFsL21lcmdlLnB5 100644 --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -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