Re: [PATCH 4/5] merge-recursive: rename conflict_rename_*() family of functions

2018-05-21 Thread Johannes Schindelin
Hi Elijah, On Fri, 18 May 2018, Elijah Newren wrote: > These functions were added because processing of these conflicts needed > to be deferred until process_entry() in order to get D/F conflicts and > such right. The number of these has grown over time, and now include > some whose name is

[PATCH 4/5] merge-recursive: rename conflict_rename_*() family of functions

2018-05-18 Thread Elijah Newren
These functions were added because processing of these conflicts needed to be deferred until process_entry() in order to get D/F conflicts and such right. The number of these has grown over time, and now include some whose name is misleading: * conflict_rename_normal() is for handling normal