Re: [PATCH 27/30] merge-recursive: Apply necessary modifications for directory renames

2017-11-15 Thread Elijah Newren
On Wed, Nov 15, 2017 at 12:23 PM, Stefan Beller wrote: >> + if (!strcmp(pair->one->path, pair->two->path)) { >> + /* >> +* Paths should only match if this was initially a >> +* non-rename that

Re: [PATCH 27/30] merge-recursive: Apply necessary modifications for directory renames

2017-11-15 Thread Stefan Beller
> + if (!strcmp(pair->one->path, pair->two->path)) { > + /* > +* Paths should only match if this was initially a > +* non-rename that is being turned into one by > +* directory rename