merge-tree: lose unused "resolve_directories"
[gitweb.git] / merge-blobs.h
2012-12-10 Which merge_file() function do you mean?