mergestate: document `o` merge record state in _mergestate_base docs
_mergestate_base documentation serves as a nice documentation for mergestate.
This also documents known merge records and known merge record states.
I missed adding `o` state to it when I introduced it. Let's add it now.
Differential Revision: https://phab.mercurial-scm.org/D9156
--- a/mercurial/mergestate.py Fri Oct 09 00:33:50 2020 -0400
+++ b/mercurial/mergestate.py Tue Oct 06 19:11:34 2020 +0530
@@ -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.