Mercurial > public > mercurial-scm > hg-stable

diff tests/test-rebase-conflicts.t @ 48606:74973a6d4e67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: always define a "base" label It simplifies the code and improves the conflict markers to always have the "base" label defined. Differential Revision: https://phab.mercurial-scm.org/D12016
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 20 Jan 2022 14:13:12 -0800
parents e2f7b2695ba1
children 402a6b6173e9
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Thu Jan 20 13:43:43 2022 -0800
+++ b/tests/test-rebase-conflicts.t	Thu Jan 20 14:13:12 2022 -0800
@@ -374,7 +374,7 @@
    a
   +<<<<<<< dest:   328e4ab1f7cc ab - test: ab
    b
-  +||||||| base
+  +||||||| base:   cb9a9f314b8b - test: a
   +=======
   +b
   +c