summaryrefslogtreecommitdiffstats
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-20 23:25:38 +0100
committerJunio C Hamano <gitster@pobox.com>2012-03-20 23:25:38 +0100
commit39af78961d8e7f4c0aee73e77e9eb5b6033f79c2 (patch)
tree03df3de35df25fa5aae34b993fb7da8eb383a462 /git-merge-octopus.sh
parentMerge branch 'jn/gitweb-unspecified-action' into maint-1.7.8 (diff)
parenti18n of multi-line advice messages (diff)
downloadgit-39af78961d8e7f4c0aee73e77e9eb5b6033f79c2.tar.xz
git-39af78961d8e7f4c0aee73e77e9eb5b6033f79c2.zip
Merge branch 'jc/advise-i18n' into maint-1.7.8
* jc/advise-i18n: i18n of multi-line advice messages
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions