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-Tag: v1.8.2-rc0~97
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9591fcc6d66fd213c8c9f73553b7684b73daf4cb?ds=inline;hp=--cc

Merge branch 'jc/merge-blobs'

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

9591fcc6d66fd213c8c9f73553b7684b73daf4cb