summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-04-29 01:32:27 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-05-02 17:06:10 (GMT)
commitd45b52b540b13a6dae816b65f0f5431b56583570 (patch)
treefa73a06ad12653f92154d345571595826cf0b04d
parent1afd1ec1077a6d43b9492e19ea88f5928204d4cc (diff)
downloadgit-d45b52b540b13a6dae816b65f0f5431b56583570.zip
git-d45b52b540b13a6dae816b65f0f5431b56583570.tar.gz
git-d45b52b540b13a6dae816b65f0f5431b56583570.tar.bz2
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>
-rwxr-xr-xgit-gui.sh7
1 files changed, 2 insertions, 5 deletions
diff --git a/git-gui.sh b/git-gui.sh
index dd8a408..ba2ee98 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
}