path: root/git-gui/lib/remote_branch_delete.tcl
diff options
authorJunio C Hamano <>2009-05-02 05:11:57 (GMT)
committerJunio C Hamano <>2009-05-02 05:11:57 (GMT)
commita8816e7bab0354badd915c1da09421a64c982831 (patch)
tree4d481c55f29d977384f312646c84b0adb4ad0d4b /git-gui/lib/remote_branch_delete.tcl
parent1087aba86b4a687cabf03d4a060d4b51282819d3 (diff)
parenta91be3fcbe92c24e809b1ec85881a6da40a9a340 (diff)
Merge git://
* git:// git-gui: Fixes for Mac OS X TkAqua git-gui: Update Russian translation git-gui: run post-checkout hook after clone git-gui: Ensure consistent usage of mergetool.keepBackup git-gui: fix use of undeclared variable diff_empty_count git-gui (Win): make starting via "Git GUI Here" on .git/ possible git-gui (Win): make "Explore Working Copy" more robust git-gui: run post-checkout hook on checkout git-gui: When calling post-commit hook wrong variable was cleared. git-gui: use `git --html-path` to get the location of installed HTML docs git-gui: fix deleting from the context menu with empty selection git-gui: minor spelling fix and string factorisation. git-gui: various French translation fixes git-gui: Fix merge conflict display error when filename contains spaces git-gui: don't hide the Browse button when resizing the repo chooser Append ampersand to "Target" of lnk files created by do_cygwin_shortcut git-gui: Support more git version notations. git-gui: Avoid an infinite rescan loop in handle_empty_diff. git-gui: Fix post-commit status with subject in non-locale encoding
Diffstat (limited to 'git-gui/lib/remote_branch_delete.tcl')
1 files changed, 1 insertions, 3 deletions
diff --git a/git-gui/lib/remote_branch_delete.tcl b/git-gui/lib/remote_branch_delete.tcl
index 89eb0f7..4e02fc0 100644
--- a/git-gui/lib/remote_branch_delete.tcl
+++ b/git-gui/lib/remote_branch_delete.tcl
@@ -213,9 +213,7 @@ method _delete {} {
-type yesno \
-title [wm title $w] \
-parent $w \
- -message [mc "Recovering deleted branches is difficult.
-Delete the selected branches?"]] ne yes} {
+ -message [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"]] ne yes} {