On Wed, Oct 12, 2022 at 5:59 PM Tao Klerks via GitGitGadget <gitgitgadget@xxxxxxxxx> wrote: > > From: Tao Klerks <tao@xxxxxxxxxx> > > When no merge.tool or diff.tool is configured or manually selected, the > selection of a default tool is sensitive to the DISPLAY variable; in a > GUI session a gui-specific tool will be proposed if found, and > otherwise a terminal-based one. This "GUI-optimizing" behavior is > important because a GUI can make a huge difference to a user's ability > to understand and correctly complete a non-trivial conflicting merge. > Quick clarification - this was intended to be an RFC. I forgot that with GitGitGadget at the moment (until we do something to explicitly support RFCs) a single-commit patch needs the *commit* to have the RFC prefix, instead of the Merge Request, as the commit's subject is used instead of the merge request's subject in a single-commit patch. I will make sure any later RFC versions have the prefix as appropriate.
