Code

gettextize: git-pull "rebase against" / "merge with" messages
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Mon, 13 Sep 2010 19:22:37 +0000 (19:22 +0000)
committerÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sat, 30 Oct 2010 07:58:21 +0000 (07:58 +0000)
commitaa7abb454239c6e7fcf7675ee39c2909291eea13
tree8740a54360e2f30c238c8232d3974f9c1c7c2242
parente13a8efbcc2ec93071fd164aaf142f79374438b8
gettextize: git-pull "rebase against" / "merge with" messages

Gettextize the two messages that used "rebase against" and "merge
with". Split them into two depending on whether we are rebasing or not.

This results in some duplication, but makes it much easier for
translators to translate these messages.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
git-pull.sh