Skip to content

Commit

Permalink
git-gui: Correct line wrapping for too many branch message
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
spearce committed May 2, 2007
1 parent 1afd1ec commit d45b52b
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions git-gui.sh
Expand Up @@ -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
}
Expand Down

0 comments on commit d45b52b

Please sign in to comment.