Hi Kristoffer, Le 2024-03-11 à 06:29, Kristoffer Haugsbakk a écrit : > Hi Philippe > > On Sun, Mar 10, 2024, at 20:51, Philippe Blain via GitGitGadget wrote: >> diff --git a/Documentation/config/advice.txt >> b/Documentation/config/advice.txt >> index c7ea70f2e2e..a1178284b23 100644 >> --- a/Documentation/config/advice.txt >> +++ b/Documentation/config/advice.txt >> @@ -56,6 +56,8 @@ advice.*:: >> Advice on how to set your identity configuration when >> your information is guessed from the system username and >> domain name. >> + mergeConflict:: >> + Advice shown when various commands stop because of conflicts. > > Given that topic kh/branch-ref-syntax-advice is in `next`, maybe this > should be changed to “Shown when”?[1] > > 🔗 1: https://lore.kernel.org/git/7017ff3fff773412e8c472d8e59a132b0e8faae7.1709670287.git.code@xxxxxxxxxxxxxxx/ Thanks for the pointer, I will change that for uniformity in that section of the doc. Cheers, Philippe.
