On Wed, Feb 02 2022, Elijah Newren via GitGitGadget wrote: > From: Elijah Newren <newren@xxxxxxxxx> > > Much like `git merge` updates the index with information of the form > (mode, oid, stage, name) > provide this output for conflicted files for merge-tree as well. > Provide an --exclude-modes-oids-stages/-l option for users to exclude This. > +--exclude-oids-and-modes:: No longer matches this.