summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:41:53 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-09 23:52:54 -0800
commitf7b3742a6b60d39adbf02258cfc72cb5b9ca8ad5 (patch)
treeeca0fe07476f236d8f00edf06a250fd58082d336 /builtin/merge-file.c
parenti18n: git-fetch formatting messages (diff)
downloadtgif-f7b3742a6b60d39adbf02258cfc72cb5b9ca8ad5.tar.xz
i18n: git-fetch update_local_ref messages
Translate a "[rejected]" message spotted by Jeff King, and other things in update_local_ref along with it. Reported-by: Jeff King <peff@peff.net> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions