From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 12 Jan 2013 02:34:24 +0000 (-0800)
Subject: Merge branch 'jc/merge-blobs'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c566ea13fd25be8a7c20bdf3644d1ebe3f65b690;p=git.git

Merge branch 'jc/merge-blobs'

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?
---

c566ea13fd25be8a7c20bdf3644d1ebe3f65b690