Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-changedelete.t
changeset 48589 a51c522c0064
parent 48584 74973a6d4e67 
--- a/tests/test-merge-changedelete.t	Tue Jan 18 14:57:15 2022 -0800
+++ b/tests/test-merge-changedelete.t	Tue Jan 18 15:04:55 2022 -0800
@@ -680,12 +680,12 @@
   changed
   --- file3 ---
   3
-  <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
+  <<<<<<< working copy:    13910f48cf7b - test: changed file1, removed file2, c...
   changed2
-  ||||||| base:         ab57bf49aa27 - test: added files
+  ||||||| common ancestor: ab57bf49aa27 - test: added files
   =======
   changed1
-  >>>>>>> merge rev:    10f9a0a634e8 - test: removed file1, changed file2, chan...
+  >>>>>>> merge rev:       10f9a0a634e8 - test: removed file1, changed file2, c...
 
 Exercise transitions between local, other, fail and prompt, and make sure the
 dirstate stays consistent. (Compare with each other and to the above
mercurial