summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-13 11:24:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-13 11:24:11 -0700
commit67166a8da6283fa519fb257fa222b968fa70db50 (patch)
tree5a9d947a301e571b377ac5fec5469e5a11d636fd /Documentation/git-mergetool--lib.txt
parentMerge branch 'va/i18n-even-more' (diff)
parentunpack-trees: fix English grammar in do-this-before-that messages (diff)
downloadtgif-67166a8da6283fa519fb257fa222b968fa70db50.tar.xz
Merge branch 'ah/unpack-trees-advice-messages'
Grammofix. * ah/unpack-trees-advice-messages: unpack-trees: fix English grammar in do-this-before-that messages
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions