Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
relnotes/next
changeset 46142 634cea2c247f
parent 46139 3ca5ca380a34
child 46164 a27aa754d6ba
equal deleted inserted replaced
46141:41733a1c3532 46142:634cea2c247f 
    35    shows one snapshot and a diff. This may be useful when at least one
 
    35    shows one snapshot and a diff. This may be useful when at least one
 
    36    side of the conflict is similar to the base. The new marker style
 
    36    side of the conflict is similar to the base. The new marker style
 
    37    is also supported by "premerge" as
 
    37    is also supported by "premerge" as
 
    38    `merge-tools.<tool>.premerge=keep-mergediff`.
 
    38    `merge-tools.<tool>.premerge=keep-mergediff`.
 
    39 
    39 
       
    40  * External hooks are now called with `HGPLAIN=1` preset.
 
       
    41 
    40 == New Experimental Features ==
 
    42 == New Experimental Features ==
 
    41 
    43 
    42 * `experimental.single-head-per-branch:public-changes-only` can be used
 
    44 * `experimental.single-head-per-branch:public-changes-only` can be used
 
    43   restrict the single head check to public revision. This is useful for
 
    45   restrict the single head check to public revision. This is useful for
 
    44   overlay repository that have both a publishing and non-publishing view
 
    46   overlay repository that have both a publishing and non-publishing view
mercurial