Hi Jean-Nöel, Le 2024-02-13 à 03:33, Jean-Noël Avila a écrit : > Le 11/02/2024 à 00:35, Philippe Blain a écrit : >> From: Michael Lohmann <mi.al.lohmann@xxxxxxxxx> >> >> >> diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt >> index c2213bb77b..80ff4e149a 100644 >> --- a/Documentation/gitk.txt >> +++ b/Documentation/gitk.txt >> @@ -63,10 +63,10 @@ linkgit:git-rev-list[1] for a complete list. >> --merge:: >> - After an attempt to merge stops with conflicts, show the commits on >> - the history between two branches (i.e. the HEAD and the MERGE_HEAD) >> - that modify the conflicted files and do not exist on all the heads >> - being merged. >> + Show commits touching conflicted paths in the range `HEAD...$OTHER`, > > if $OTHER is a placeholder, why not use the placeholder notation <other> > instead of a notation that could deceive the reader into thinking that > this is an actual environment variable? Good point, I'll make that change. Thanks! Philippe.
