summaryrefslogtreecommitdiff
path: root/sequencer.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-08-26 21:46:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-08-26 21:46:23 (GMT)
commit6160b2e9a486f5dc29f621e94a0e5dcce0ab3d52 (patch)
treef72303a02840f480d66a121a247645056f2c1bf6 /sequencer.h
parent27126692ba1688081d8427220087bb7662594bd9 (diff)
downloadgit-6160b2e9a486f5dc29f621e94a0e5dcce0ab3d52.zip
git-6160b2e9a486f5dc29f621e94a0e5dcce0ab3d52.tar.gz
git-6160b2e9a486f5dc29f621e94a0e5dcce0ab3d52.tar.bz2
t3436: do not run git-merge-recursive in dashed form
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.h')
0 files changed, 0 insertions, 0 deletions