[Updated] D9156: mergestate: document `o` merge record state in _mergestate_base docs

[pulkit (Pulkit Goyal)]

Closed by commit rHGecf6d7aa874b: mergestate: document `o` merge record state in _mergestate_base docs (authored by pulkit).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D9156?vs=23059&id=23201#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D9156?vs=23059&id=23201

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D9156/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D9156

AFFECTED FILES
  mercurial/mergestate.py

CHANGE DETAILS

diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py
--- a/mercurial/mergestate.py
+++ b/mercurial/mergestate.py
@@ -160,6 +160,7 @@
     r: resolved conflict
     pu: unresolved path conflict (file conflicts with directory)
     pr: resolved path conflict
+    o: file was merged in favor of other parent of merge (DEPRECATED)
 
     The resolve command transitions between 'u' and 'r' for conflicts and
     'pu' and 'pr' for path conflicts.



To: pulkit, #hg-reviewers
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20201014/f57e30ba/attachment-0002.html>