Mercurial > hg

diff mercurial/win32.py @ 48557:c6649c53073f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: make merge_lines() a free function IMO, the rendering of a conflict as text with merge markers should be separate from the code for resolving conflicts. The latter is what `Merge3Text` is mostly about already. Differential Revision: https://phab.mercurial-scm.org/D11974
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 07 Jan 2022 22:16:22 -0800
parents d4ba4d51f85f
children 6000f5b25c9b
line wrap: on
line diff