summaryrefslogtreecommitdiff
path: root/mergetools/araxis
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-11-27 11:06:39 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-27 11:06:39 +0900
commit88e2efcbc415f234d38e6e1c59c8d8ae03c989b3 (patch)
tree731d879555549822c61743d0c9f42e2283ad6516 /mergetools/araxis
parentMerge branch 'rs/config-write-section-fix' (diff)
parentgit-rebase: clean up dashed-usages in messages (diff)
downloadtgif-88e2efcbc415f234d38e6e1c59c8d8ae03c989b3.tar.xz
Merge branch 'ks/rebase-no-git-foo'
Mentions of "git-rebase" and "git-am" (dashed form) still remained in end-user visible strings emitted by the "git rebase" command; they have been corrected. * ks/rebase-no-git-foo: git-rebase: clean up dashed-usages in messages
Diffstat (limited to 'mergetools/araxis')
0 files changed, 0 insertions, 0 deletions