summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-07-06 18:14:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-07-06 18:14:45 -0700
commit2f4bcd8b70041627abdf7811acb67cc8e7bee574 (patch)
tree80bd799401fe27f0f65f9d1babbad11dbd63fe18 /sequencer.c
parentMerge branch 'rs/apply-avoid-over-reading' (diff)
parentmerge-recursive: use DIFF_XDL_SET macro (diff)
downloadtgif-2f4bcd8b70041627abdf7811acb67cc8e7bee574.tar.xz
Merge branch 'sb/merge-recursive-code-cleanup'
Code clean-up. * sb/merge-recursive-code-cleanup: merge-recursive: use DIFF_XDL_SET macro
Diffstat (limited to 'sequencer.c')
0 files changed, 0 insertions, 0 deletions