Merge 'git-gui-add-2nd-line' into HEAD

dscho · dscho · commit 8ad977d5dd68 · 2016-08-29T17:45:14.000+02:00
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
@@ -696,6 +696,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:
