summaryrefslogtreecommitdiff
path: root/mergetools/ecmerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-26 15:45:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-26 15:45:33 -0700
commit74702c382597ce34e7ce884e29d23e1eedb52196 (patch)
tree7eb3d572af32c7ef2f42fd4b9a8bb817c7c2c429 /mergetools/ecmerge
parentMerge branch 'pt/am-builtin-abort-fix' (diff)
parenti18n: am: fix typo in description of -b option (diff)
downloadtgif-74702c382597ce34e7ce884e29d23e1eedb52196.tar.xz
Merge branch 'pt/am-builtin'
Rewrite "am" in "C". * pt/am-builtin: i18n: am: fix typo in description of -b option
Diffstat (limited to 'mergetools/ecmerge')
0 files changed, 0 insertions, 0 deletions