Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information