global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 18:33:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

gitk: Fix wrong merge

Browse Source 
This fixes the wrong conflict resolution of merge
5673e9999d
This commit is contained in:
Steffen Prohaska
2008-08-16 16:11:28 +02:00
parent 0e85bae739
commit 7c2ca98651
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gitk-git/gitk
View File

@@ -9993,4 +9993,4 @@ if {[info exists permviews]} {
}
}
focus -force .
getcommits
getcommits {}