Mercurial > evolve

annotate .hg-format-source @ 4998:88b816a9d990 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: preserve date when resolving content-divergence (issue6202) This patch changes the implementation to do a 3 way merge. In case of actual conflict, it take the newest date from both sides of the content-divergence.
author Manuel Jacob <me@manueljacob.de>
date Fri, 11 Oct 2019 21:32:27 +0200
parents 48b30ff742cb
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4814
48b30ff742cb python3: use format-source to run byteify-strings in .py files
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
1 {"pattern": "glob:hgext3rd/**/*.py", "tool": "byteify-strings"}