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: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Apr 28, 2007 at 21:32 UTC
d45b52b540b13a6dae816b65f0f5431b56583570
1 file changed
+2
-5
git-gui.sh
+2
-5
@@ -2907,12 +2907,9 @@ You are merging $revcnt branches at once. This requires using the octopus merge
2907
-parent $w \
2908
-message "Too many branches selected.
2909
2910
-You have requested to merge $revcnt branches
2911
-in an octopus merge. This exceeds Git's
2912
-internal limit of 15 branches per merge.
2910
+You have requested to merge $revcnt branches in an octopus merge. This exceeds Git's internal limit of 15 branches per merge.
2911
2914
-Please select fewer branches. To merge more
2915
-than 15 branches, merge the branches in batches.
2912
+Please select fewer branches. To merge more than 15 branches, merge the branches in batches.
2913
"
2914
return
2915
}