From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Jan 2013 18:48:20 +0000 (-0800)
Subject: Merge branch 'jc/merge-blobs'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9591fcc6d66fd213c8c9f73553b7684b73daf4cb;p=git.git

Merge branch 'jc/merge-blobs'

* jc/merge-blobs:
  Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
---

9591fcc6d66fd213c8c9f73553b7684b73daf4cb