diff options
| author | Alexander Gavrilov <angavrilov@gmail.com> | 2008-10-08 11:05:37 +0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-10-21 22:37:39 +1100 |
| commit | 2df6442f7dc0d6cd5636e6ac413d06f92eb04029 (patch) | |
| tree | 7f467ce761b05472112bc0142f9e2c1f3fb0e9f1 /git-gui/lib/diff.tcl | |
| parent | gitk: Allow forcing branch creation if it already exists (diff) | |
| download | git-2df6442f7dc0d6cd5636e6ac413d06f92eb04029.tar.gz git-2df6442f7dc0d6cd5636e6ac413d06f92eb04029.zip | |
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>
Diffstat (limited to 'git-gui/lib/diff.tcl')
0 files changed, 0 insertions, 0 deletions