提交 d45b52b5 编写于 作者: S Shawn O. Pearce

git-gui: Correct line wrapping for too many branch message

Since Tk automatically wraps lines for us in tk_messageBox
widgets we don't need to try to wrap them ourselves.  Its
actually worse that we linewrapped this here in the script,
as not all fonts will render this dialog nicely.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
上级 1afd1ec1
......@@ -2907,12 +2907,9 @@ You are merging $revcnt branches at once. This requires using the octopus merge
-parent $w \
-message "Too many branches selected.
You have requested to merge $revcnt branches
in an octopus merge. This exceeds Git's
internal limit of 15 branches per merge.
You have requested to merge $revcnt branches in an octopus merge. This exceeds Git's internal limit of 15 branches per merge.
Please select fewer branches. To merge more
than 15 branches, merge the branches in batches.
Please select fewer branches. To merge more than 15 branches, merge the branches in batches.
"
return
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册