From d45b52b540b13a6dae816b65f0f5431b56583570 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sat, 28 Apr 2007 21:32:27 -0400 Subject: [PATCH] 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 --- git-gui.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index dd8a408c64..ba2ee985f7 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -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 } -- 2.11.4.GIT