git.99rst.org Git - git.git/commit

git.99rst.org / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c4ada62 a60521b)

author	Junio C Hamano <redacted>
	Tue, 22 Jan 2013 18:48:20 +0000 (10:48 -0800)
committer	Junio C Hamano <redacted>
	Tue, 22 Jan 2013 18:48:20 +0000 (10:48 -0800)
commit	9591fcc6d66fd213c8c9f73553b7684b73daf4cb
tree	8dd432bdf7821f0a86349628f148fed232acc995	tree \| snapshot
parent	c4ada6283eaf1d4970b92b0e2cb9503a17da27ad	commit \| diff
parent	a60521bc6099ce89d05ef2160d2e3c30a106fda7	commit \| diff

Merge branch 'jc/merge-blobs'

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

git clone https://git.99rst.org/PROJECT