"Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > From: Elijah Newren <newren@xxxxxxxxx> > > am previously only checked gpg-related config options and the default > config options while ignoring any diff-related options. This meant that > when users tried to set diff.context to something larger than the > default value of 3, it was ignored. Pay attention to the diff settings > too. Can the benefit brought in by this change demonstrated by a new test or two? Puzzled. "am" accepts whatever patch somebody else prepared and has no control over how the incoming "diff" was produced by that somebody else. Besides, I do not think it should be affected by any diff_*UI*_config() in the first place.