Mercurial > public > mercurial-scm > hg-stable

diff mercurial/streamclone.py @ 48591:ad0c6bf6f02e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: make minimize() a free function IMO, `Merge3Text` should be about merging text without knowing about conflict markers. "Conflict minimization" is about making conflict markers smaller, so it should be moved out. This patch does that. I'll refactor it next. Differential Revision: https://phab.mercurial-scm.org/D11980
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 11 Jan 2022 22:03:55 -0800
parents 31a72e5e9200
children 6d2ddea0721a 739f2ca3aa3f
line wrap: on
line diff