summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Brian Henderson <henderson.bj@gmail.com>2016-08-29 10:33:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-29 12:20:50 -0700
commit7e4ffb4c1778c725db3db116f016ef2ad1c6d218 (patch)
tree922432ec54849c67c42a52b449023307b2e3e59f /merge-recursive.c
parentdiff-highlight: add failing test for handling --graph output (diff)
downloadtgif-7e4ffb4c1778c725db3db116f016ef2ad1c6d218.tar.xz
diff-highlight: add support for --graph output
Signed-off-by: Brian Henderson <henderson.bj@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions