projects / gitk / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bee866f) | patch
gitk: Fix file list context menu for merge commits
authorAlexander Gavrilov <angavrilov@gmail.com>
Wed, 8 Oct 2008 07:05:37 +0000 (11:05 +0400)
committerPaul Mackerras <paulus@samba.org>
Tue, 21 Oct 2008 11:37:39 +0000 (22:37 +1100)
commit2df6442f7dc0d6cd5636e6ac413d06f92eb04029
tree7f467ce761b05472112bc0142f9e2c1f3fb0e9f1tree | snapshot
parentbee866fa6b5a77f65d9915f8778919ef76d9d6c1commit | diff
gitk: Fix file list context menu for merge commits

Currently it displays an ugly error box, because the treediffs array
is not filled for such commits.  This fixes it by making
getmergediffline add the filenames it sees to the treediffs array
like gettreediffline does.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk diff | blob | history
Gitk: Windows and themed Tk support