On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren <newren@xxxxxxxxx> wrote: > Directory renames with the ability to merge directories opens up the > possibility of add/add/add/.../add conflicts, if each of the N > directories being merged into one target directory all had a file with > the same name. We need a way to check for and report on such > collisions; this hashmap will be used for this purpose. > > Signed-off-by: Elijah Newren <newren@xxxxxxxxx> > --- The same comment on compiling applies here. Nice to review, but it may not compile due to unused functions that a strict compiler may not be happy about.