On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren <newren@xxxxxxxxx> wrote: > When a file is present in HEAD before the merge and the other side of the > merge does not modify that file, we try to avoid re-writing the file and > making it stat-dirty. However, when a file is present in HEAD before the > merge and was in a directory that was renamed by the other side of the > merge, we have to move the file to a new location and re-write it. > Update the code that checks whether we can skip the update to also work in > the presence of directory renames. > > Signed-off-by: Elijah Newren <newren@xxxxxxxxx> > --- Now I did not just review the tests, but also the code of this series. (though I think I was more detail oriented on Friday) All patches that had no comments are fine with me, I left some comments on others. Thanks, Stefan
