branching: merge stable into default
authorRaphaël Gomès <rgomes@octobus.net>
Fri, 23 Feb 2024 15:09:18 +0100
changeset 51437 d1fb42a71676
parent 51436 827b89714a8d (current diff)
parent 51399 46fed351e451 (diff)
child 51438 05eba178da45
child 51443 69ad1d1d9947
branching: merge stable into default
contrib/perf.py
--- a/contrib/perf.py	Fri Feb 23 14:07:33 2024 +0100
+++ b/contrib/perf.py	Fri Feb 23 15:09:18 2024 +0100
@@ -1710,7 +1710,8 @@
     b'perf::phases|perfphases',
     [
         (b'', b'full', False, b'include file reading time too'),
-    ],
+    ]
+    + formatteropts,
     b"",
 )
 def perfphases(ui, repo, **opts):