summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-21 15:07:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-21 15:07:19 -0700
commit9f43095e4638ec070b361762a43001563177394f (patch)
treee8e65687716dee3607541a40ee0363dda72d1d33 /t/t7600-merge.sh
parentMerge branch 'sb/wt-status-cleanup' (diff)
parentdoc: change erroneous --[no]-whatever into --[no-]whatever (diff)
downloadtgif-9f43095e4638ec070b361762a43001563177394f.tar.xz
Merge branch 'ab/doc-no-option-notation-fix'
Doc fix. * ab/doc-no-option-notation-fix: doc: change erroneous --[no]-whatever into --[no-]whatever
Diffstat (limited to 't/t7600-merge.sh')
0 files changed, 0 insertions, 0 deletions