summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-03-05 01:23:35 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-05 12:20:23 -0800
commitfcfec8bd9a9bf0a0f36ba4aed85f5768988aa946 (patch)
treedd9023998b0196dc28e1f70a8bb8a03332344ed1 /merge-recursive.h
parentdifftool: support repositories with .git-files (diff)
downloadtgif-fcfec8bd9a9bf0a0f36ba4aed85f5768988aa946.tar.xz
t7800: add a difftool test for .git-files
Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions