summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-11-11 13:16:45 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-11 13:18:40 -0800
commite31aba42fb12bdeb0f850829e008e1e3f43af500 (patch)
tree9e7cba45f1ef65a45647bce181bdf78f65da90a4 /Documentation/merge-options.txt
parentMerge branch 'jc/sequencer-stopped-sha-simplify' (diff)
downloadtgif-e31aba42fb12bdeb0f850829e008e1e3f43af500.tar.xz
Fifth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions