Sync with 2.15.3

diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index 4cae10a4c7f197aab9ae0bc145254a8d4a1bae50..68c4a6c7366f864bcfc500483c83b15860a2d185 100644 (file)
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -698,6 +698,7 @@ proc apply_range_or_line {x y} {
                set hh [$ui_diff get $i_l "$i_l + 1 lines"]
                set hh [lindex [split $hh ,] 0]
                set hln [lindex [split $hh -] 1]
+               set hln [lindex [split $hln " "] 0]
 
                # There is a special situation to take care of. Consider this
                # hunk: