Re: [PATCH v7 25/31] merge-recursive: apply necessary modifications for directory renames

2018-02-15 Thread SZEDER Gábor
On Wed, Jan 31, 2018 at 12:25 AM, Elijah Newren wrote: > This commit hooks together all the directory rename logic by making the > necessary changes to the rename struct, it's dst_entry, and the > diff_filepair under consideration. > > Signed-off-by: Elijah Newren

[PATCH v7 25/31] merge-recursive: apply necessary modifications for directory renames

2018-01-30 Thread Elijah Newren
This commit hooks together all the directory rename logic by making the necessary changes to the rename struct, it's dst_entry, and the diff_filepair under consideration. Signed-off-by: Elijah Newren --- merge-recursive.c | 187