Merge branch 'maint'

* maint:
git-gui: fix deleting from the context menu with empty selection

diff --git a/git-gui.sh b/git-gui.sh
index 2f1f305019a1af1aec5f9885468188c9daa7a8ef..b3aa7325f037b8a4c918859f639e7aa210a1f107 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -2944,7 +2944,7 @@ $ctxm add command \
        -command {tk_textPaste $ui_comm}
 $ctxm add command \
        -label [mc Delete] \
-       -command {$ui_comm delete sel.first sel.last}
+       -command {catch {$ui_comm delete sel.first sel.last}}
 $ctxm add separator
 $ctxm add command \
        -label [mc "Select All"] \