提交 c2b1a95c 编写于 作者: J Jon Seymour 提交者: Junio C Hamano

pull: take advantage of eval_gettextln

Signed-off-by: NJon Seymour <jon.seymour@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 de88c1ce
......@@ -217,12 +217,9 @@ then
# $orig_head commit, but we are merging into $curr_head.
# First update the working tree to match $curr_head.
(
eval_gettext "Warning: fetch updated the current branch head.
eval_gettextln "Warning: fetch updated the current branch head.
Warning: fast-forwarding your working tree from
Warning: commit \$orig_head." &&
echo
) >&2
Warning: commit \$orig_head." >&2
git update-index -q --refresh
git read-tree -u -m "$orig_head" "$curr_head" ||
die "$(eval_gettext "Cannot fast-forward your working tree.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册