summaryrefslogtreecommitdiff
path: root/gitk-git
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-22 10:48:20 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-22 10:48:20 -0800
commit9591fcc6d66fd213c8c9f73553b7684b73daf4cb (patch)
tree8dd432bdf7821f0a86349628f148fed232acc995 /gitk-git
parentUpdate draft release notes to 1.8.2 (diff)
parentMakefile: Replace merge-file.h with merge-blobs.h in LIB_H (diff)
downloadtgif-9591fcc6d66fd213c8c9f73553b7684b73daf4cb.tar.xz
Merge branch 'jc/merge-blobs'
* jc/merge-blobs: Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
Diffstat (limited to 'gitk-git')
0 files changed, 0 insertions, 0 deletions