summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2011-05-21 18:43:42 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-21 11:57:13 -0700
commitb9a972691e3967166e642bd91ea229087a6b4874 (patch)
tree84620b0c2ef6cdb86d9f6aa67f9f9e0a77cf568d /Documentation/git-merge-file.txt
parentMakefile: add xgettext target for *.sh files (diff)
downloadtgif-b9a972691e3967166e642bd91ea229087a6b4874.tar.xz
i18n: git-am add git-sh-i18n
Source git-sh-i18n in git-am.sh, it's needed to import the Git gettext shell functions. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions