summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-19 13:51:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-19 13:51:45 -0700
commit9f3d73e8cb2e9ae1123c218cc1ecff3032c82286 (patch)
tree42d644f82aa73385a4bdf170faed16f527c4cc45 /mergetools
parentMerge branch 'sb/transport-report-missing-submodule-on-stderr' into maint (diff)
parentunpack-trees: do not capitalize "working" (diff)
downloadtgif-9f3d73e8cb2e9ae1123c218cc1ecff3032c82286.tar.xz
Merge branch 'ah/misc-message-fixes' into maint
Message cleanup. * ah/misc-message-fixes: unpack-trees: do not capitalize "working" git-merge-octopus: do not capitalize "octopus" git-rebase--interactive: fix English grammar cat-file: put spaces around pipes in usage string am: put spaces around pipe in usage string
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions