Mercurial > hg

diff tests/test-merge4.t @ 48588:402a6b6173e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: set custom conflict label for base commit Differential Revision: https://phab.mercurial-scm.org/D12020
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 18 Jan 2022 14:57:15 -0800
parents fc4fb2f17dd4
children 55c6ebd11cb9
line wrap: on
line diff