| commit | 2df6442f7dc0d6cd5636e6ac413d06f92eb04029 | [log] [tgz] |
|---|---|---|
| author | Alexander Gavrilov <angavrilov@gmail.com> | Wed Oct 08 11:05:37 2008 +0400 |
| committer | Paul Mackerras <paulus@samba.org> | Tue Oct 21 22:37:39 2008 +1100 |
| tree | 7f467ce761b05472112bc0142f9e2c1f3fb0e9f1 | |
| parent | bee866fa6b5a77f65d9915f8778919ef76d9d6c1 [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>