summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2012-02-01 17:20:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-01 23:46:24 (GMT)
commitbe39de2b262bfcd440ed81b4de33711eb8a37cf4 (patch)
tree012be41eacb74025ab6ba1c23937a87f489dfe07 /git-merge-octopus.sh
parent828ea97de486c1693d6e4f2c7347acb50235a85d (diff)
downloadgit-be39de2b262bfcd440ed81b4de33711eb8a37cf4.zip
git-be39de2b262bfcd440ed81b4de33711eb8a37cf4.tar.gz
git-be39de2b262bfcd440ed81b4de33711eb8a37cf4.tar.bz2
i18n: git-commit whence_s "merge/cherry-pick" message
Mark the "merge/cherry-pick" messages in whence_s for translation. These messages returned from whence_s function are used as argument to build other messages. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions