diff options
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 7 |
1 files 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 } |