summaryrefslogtreecommitdiff
path: root/git-gui/lib/diff.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-24 19:16:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-24 19:16:26 (GMT)
commitb30ccd757354ea09b41e4359b0a5ab429d12f02e (patch)
tree171cf9a99a9fe390a98a2d6a500e2ff37b9f19eb /git-gui/lib/diff.tcl
parent288123f01cb1b835edbf6e2e188159c2ff858aca (diff)
parent87cd09f43e56de5235d09aef3ff5d840419fef49 (diff)
downloadgit-b30ccd757354ea09b41e4359b0a5ab429d12f02e.zip
git-b30ccd757354ea09b41e4359b0a5ab429d12f02e.tar.gz
git-b30ccd757354ea09b41e4359b0a5ab429d12f02e.tar.bz2
Merge branch 'maint' of git://git.spearce.org/git-gui into maint
* 'maint' of git://git.spearce.org/git-gui: git-gui: work from the .git dir git-gui: Fix applying a line when all following lines are deletions git-gui: Correct file_states when unstaging partly staged entry git-gui: Fix gitk for branch whose name matches local file git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync git-gui: handle really long error messages in updateindex. git-gui: Add hotkeys for "Unstage from commit" and "Revert changes" git-gui: Makefile: consolidate .FORCE-* targets
Diffstat (limited to 'git-gui/lib/diff.tcl')
-rw-r--r--git-gui/lib/diff.tcl1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index bd5d189..066755b 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -664,6 +664,7 @@ proc apply_line {x y} {
}
set i_l $next_l
}
+ set patch "$patch$pre_context"
set patch "@@ -$hln,$n +$hln,[eval expr $n $sign 1] @@\n$patch"
if {[catch {