Merge branch 'jc/merge-blobs'
authorJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 02:34:24 +0000 (11 18:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 02:34:24 +0000 (11 18:34 -0800)
Update the disused merge-tree proof-of-concept code.

* jc/merge-blobs:
  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?

1  2 
Makefile

diff --cc Makefile
Simple merge