Mercurial > hg

diff mercurial/pycompat.py @ 48559:b5e1283c0475

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: use same newline detection for :mergediff as for :merge[3] The `:merge` and `:merge3` markers used the newline style detected from the base input. The `:mergediff` style always used LF as newline character. This patch teaches `:mergediff` to use the same detection as the others did. Differential Revision: https://phab.mercurial-scm.org/D11976
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 07 Jan 2022 22:23:44 -0800
parents 6ffcaba7d122
children a0da5075bca3
line wrap: on
line diff