diff tests/test-dirstate-race.t @ 45771:f90a5c211251

rebase: change and standarize template for rebase's one-line summary This removes the default template in rebase and switches to a centrally defined template. I've simplified it a bit to avoid the conditional parenthesis. I've also added labels so the different parts can be easily colored. The template is somewhat similar to what we've used internally at Google for a few years. I'm happy to change the template if others have opinions. Should we reuse the `color.log.` names as I have? Differential Revision: https://phab.mercurial-scm.org/D9252
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 27 Oct 2020 15:33:15 -0700
parents 28a4fb793ba1
children 93eb6c8035a9
line wrap: on
line diff
--- a/tests/test-dirstate-race.t	Thu Oct 22 23:10:06 2020 -0700
+++ b/tests/test-dirstate-race.t	Tue Oct 27 15:33:15 2020 -0700
@@ -225,7 +225,7 @@
   > EOF
 
   $ hg rebase -s . -d 3 --tool test
-  rebasing 4:b08445fd6b2a "c4" (tip)
+  rebasing 4:b08445fd6b2a tip "c4"
   merging a
   custom merge tool
   custom merge tool end