Elijah Newren <newren@xxxxxxxxx> writes: >> Rename detection logic in "diff" family that is used in "merge" has >> learned to guess when all of x/a, x/b and x/c have moved to z/a, >> z/b and z/c, it is likely that x/d added in the meantime would also >> want to move to z/d by taking the hint that the entire directory >> 'x' moved to 'z'. > > When you write release notes for this series, you may want to consider > also calling out one or more of the bugs that were fixed as a side > effect: > * a bug causing dirty files involved in a rename to be overwritten > during merge > * a few memory leaks > I added a reminder about these two fixes in the cover letter for my > latest (and possibly last?) roll of the series that I just sent out. Thanks.