aboutsummaryrefslogtreecommitdiff
path: root/lib/diff.tcl
diff options
context:
space:
mode:
authorPat Thoyts <patthoyts@users.sourceforge.net>2016-10-03 23:28:57 +0100
committerPat Thoyts <patthoyts@users.sourceforge.net>2016-10-03 23:28:57 +0100
commit408c2120e02cf2a96cd44c69fe3baf406d4de157 (patch)
tree39bbc79808622e6aa3a16f0437e2bc2b39881ec7 /lib/diff.tcl
parent64c6b4c507c0295dbd54b0981510a5a8fff71947 (diff)
parenta0a0c6838744ce51bcbb634f459e173e8be59c22 (diff)
downloadgit-408c2120e02cf2a96cd44c69fe3baf406d4de157.tar.gz
git-408c2120e02cf2a96cd44c69fe3baf406d4de157.tar.xz
Merge branch 'patches' into pu
Diffstat (limited to 'lib/diff.tcl')
-rw-r--r--lib/diff.tcl3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl
index 0d5698621..30bdd691e 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -127,6 +127,9 @@ proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} {
} else {
start_show_diff $cont_info
}
+
+ global current_diff_path selected_paths
+ set selected_paths($current_diff_path) 1
}
proc show_unmerged_diff {cont_info} {