Mercurial > hg

diff tests/test-conflict.t @ 48589:a51c522c0064

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: set custom conflict label for base commit Differential Revision: https://phab.mercurial-scm.org/D12021
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 18 Jan 2022 15:04:55 -0800
parents 50de08904c63
children 7e503eff3c76
line wrap: on
line diff
--- a/tests/test-conflict.t	Tue Jan 18 14:57:15 2022 -0800
+++ b/tests/test-conflict.t	Tue Jan 18 15:04:55 2022 -0800
@@ -267,7 +267,7 @@
   3
   6
   8
-  ||||||| base
+  ||||||| common ancestor
   One
   Two
   Three