Am 07.01.22 um 20:59 schrieb Elijah Newren: > On Fri, Jan 7, 2022 at 10:46 AM Christian Couder > <christian.couder@xxxxxxxxx> wrote: >> >> On Wed, Jan 5, 2022 at 6:27 PM Elijah Newren via GitGitGadget >> <gitgitgadget@xxxxxxxxx> wrote: >> >>> This series attempts to guess what kind of output would be wanted, basically >>> choosing: >>> >>> * clean merge or conflict signalled via exit status >> >> (Maybe s/signalled/signaled/) > > I can't determine the difference after a few Google searches, and both > seem to be in dictionaries with the same meaning so I'm having > difficulty figuring out which is preferred. Usually my searches will > either suggest that one is a misspelling or at least bring up whether > one is a regional variance, but I'm not seeing anything of the sort. > > It can't hurt to switch, though, so I'm happy to switch. https://en.wiktionary.org/wiki/signal#Verb says: "present participle (UK) signalling or (US) signaling". And Documentation/SubmittingPatches says: "We prefer to gradually reconcile the inconsistencies in favor of US English". So this seems to go in the right direction. René
