Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: document `o` merge record state in _mergestate_base docs
authorPulkit Goyal <7895pulkit@gmail.com>
Tue, 06 Oct 2020 19:11:34 +0530
changeset 45714 ecf6d7aa874b
parent 45713 04de8a1ec08f
child 45715 0428978bca22
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
mercurial/mergestate.py file | annotate | diff | comparison | revisions 
--- 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.
mercurial