summaryrefslogtreecommitdiff
path: root/t/t4013/diff.config_format.subjectprefix_DIFFERENT_PREFIX
diff options
context:
space:
mode:
authorLibravatar Ramsay Jones <ramsay@ramsay1.demon.co.uk>2013-01-22 16:47:47 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-22 10:47:47 -0800
commita60521bc6099ce89d05ef2160d2e3c30a106fda7 (patch)
tree6bf5597718795107e441c3132320d46f1f1711f1 /t/t4013/diff.config_format.subjectprefix_DIFFERENT_PREFIX
parentmerge-tree: fix d/f conflicts (diff)
downloadtgif-a60521bc6099ce89d05ef2160d2e3c30a106fda7.tar.xz
Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
Commit fa2364ec ("Which merge_file() function do you mean?", 06-12-2012) renamed the files merge-file.[ch] to merge-blobs.[ch], but forgot to rename the header file in the definition of the LIB_H macro. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.config_format.subjectprefix_DIFFERENT_PREFIX')
0 files changed, 0 insertions, 0 deletions