Junio C Hamano 686b895928 Merge branch 'jc/merge-blobs' into maint ...

* jc/merge-blobs:
  Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
  merge-tree: fix d/f conflicts
  merge-tree: add comments to clarify what these functions are doing
  merge-tree: lose unused "resolve_directories"
  merge-tree: lose unused "flags" from merge_list
  Which merge_file() function do you mean?

2013-02-04 10:03:41 -08:00

86 KiB

Raw Blame History

View Raw