Re: [PATCH 3/5] merge-recursive: clarify the rename_dir/RENAME_DIR meaning

2018-05-21 Thread Johannes Schindelin
Hi Elijah, On Fri, 18 May 2018, Elijah Newren wrote: > We had an enum of rename types which included RENAME_DIR; this name felt > misleading since it was not about an entire directory but was a status for > each individual file add that occurred within a renamed directory. Since > this type is f

[PATCH 3/5] merge-recursive: clarify the rename_dir/RENAME_DIR meaning

2018-05-18 Thread Elijah Newren
We had an enum of rename types which included RENAME_DIR; this name felt misleading since it was not about an entire directory but was a status for each individual file add that occurred within a renamed directory. Since this type is for signifying that the files in question were being renamed due