summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2017-03-20 13:20:29 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-20 10:04:57 -0700
commit2c7ee986c70e276531881d8730b9bb299b30d5c0 (patch)
tree5769c2f8bd97c5cf03890a8898be10d7c88d48fa /xdiff/xmerge.c
parentPreparing for 2.12.1 (diff)
downloadtgif-2c7ee986c70e276531881d8730b9bb299b30d5c0.tar.xz
doc: change erroneous --[no]-whatever into --[no-]whatever
Change these two obvious typos to be in line with the rest of the documentation, which uses the correct --[no-]whatever form. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions