summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-12-19 14:45:41 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-12-19 14:45:41 -0800
commitf0e0955a998cc5e8dd1f33bd919dcd5db33e26bf (patch)
tree075e1bb255fdbe22cf052c8624bc211e2aa1e40a /Documentation/git-merge.txt
parentMerge branch 'da/mergetool-xxdiff-hotkey' (diff)
parentdoc: omit needless "for" (diff)
downloadtgif-f0e0955a998cc5e8dd1f33bd919dcd5db33e26bf.tar.xz
Merge branch 'kh/tutorial-grammofix'
* kh/tutorial-grammofix: doc: omit needless "for" doc: make the intent of sentence clearer doc: add verb in front of command to run doc: add articles (grammar)
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions