On Mon, Mar 19, 2018 at 3:12 PM Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> wrote: > The merge conflict becomes a tad easier to deal with, also makes sense > to have gitexecdir after infodir since that's the order we're listing > these in just a few lines earlier, and this is otherwise (mostly) > consistent. Got it, I'll update my patch set to include this in v7, which I'll post after a little more time for comment on v6. Thanks!