summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-03-22 14:24:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-22 14:24:21 -0700
commitdfc20a5e3c5f15e625044ef919c943bbc5a6aefc (patch)
treefa8d07f8570a3fdeb9549f2033f3e739ad602ed8 /Documentation/git-mergetool.txt
parentMerge branch 'sg/doc-test-must-fail-args' into maint (diff)
parentdocs/interpret-trailers: fix agreement error (diff)
downloadtgif-dfc20a5e3c5f15e625044ef919c943bbc5a6aefc.tar.xz
Merge branch 'bc/doc-interpret-trailers-grammofix' into maint
Docfix. * bc/doc-interpret-trailers-grammofix: docs/interpret-trailers: fix agreement error
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions