##// END OF EJS Templates
tests: add `hg log -G` output when there are merge conflicts...
tests: add `hg log -G` output when there are merge conflicts The next commit will change the behavior for these. I've used slightly different commands in the different tests to match the surrounding style. Differential Revision: https://phab.mercurial-scm.org/D8042

File last commit:

r44595:1f8f2152 stable
r44818:ab632e27 default
Show More
5.3
35 lines | 1.2 KiB | application/x-troff | GroffLexer
== New Features ==
* Windows will process hgrc files in %PROGRAMDATA%\Mercurial\hgrc.d.
== New Experimental Features ==
== Bug Fixes ==
* The `indent()` template function was documented to not indent empty lines,
but it still indented the first line even if it was empty. It no longer does
that.
== Backwards Compatibility Changes ==
== Internal API Changes ==
* Matcher instances no longer have a `explicitdir` property. Consider
rewriting your code to use `repo.wvfs.isdir()` and/or
`ctx.hasdir()` instead. Also, the `traversedir` property is now
also called when only `explicitdir` used to be called. That may
mean that you can simply remove the use of `explicitdir` if you
were already using `traversedir`.
* The `revlog.nodemap` object have been merged into the `revlog.index` object.
* `n in revlog.nodemap` becomes `revlog.index.has_node(n)`,
* `revlog.nodemap[n]` becomes `revlog.index.rev(n)`,
* `revlog.nodemap.get(n)` becomes `revlog.index.get_rev(n)`.
* `copies.duplicatecopies()` was renamed to
`copies.graftcopies()`. Its arguments changed from revision numbers
to context objects. It also lost its `repo` and `skip` arguments
(they should no longer be needed).