projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4ada62 a60521b)
Merge branch 'jc/merge-blobs'
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jan 2013 18:48:20 +0000 (10:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jan 2013 18:48:20 +0000 (10:48 -0800)
* jc/merge-blobs:
  Makefile: Replace merge-file.h with merge-blobs.h in LIB_H

1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
Git—the stupid content tracker