Mercurial > hg

diff tests/test-diff-change.t @ 48584: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 7d908ee19b5b
children
line wrap: on
line diff
--- a/tests/test-diff-change.t	Thu Jan 20 13:43:43 2022 -0800
+++ b/tests/test-diff-change.t	Thu Jan 20 14:13:12 2022 -0800
@@ -284,7 +284,7 @@
    7
   -<<<<<<< local: fd1f17c90d7c - test: new file
    z
-  -||||||| base
+  -||||||| base:  ae119d680c82 - test: lots of text
   -8
   -=======
   -y