Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff

2019-09-19 23:22:03 +05:30
parent f7a8834ba4 492595cfc7 63100874c1 474642b4a4 331450f18a 76756d6706 6a47fa0efa 146a6f1097 f50d5055bf 5440eb0ea2
6 changed files with 72 additions and 15 deletions
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@ -724,6 +724,7 @@ proc apply_or_revert_range_or_line {x y revert} {
 		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: