From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Feb 2013 18:03:41 +0000 (-0800)
Subject: Merge branch 'jc/merge-blobs' into maint
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=686b895928efcd577b541f589a016fc0182f3a2f;p=git.git

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

686b895928efcd577b541f589a016fc0182f3a2f