summaryrefslogtreecommitdiff
path: root/src/modconflicticondelegate.h
Commit message (Expand)AuthorAgeFilesLines
* Apply clang-format.Mikaël Capelle2023-07-091-20/+16
* Display children contents in collapsed separator.Mikaël Capelle2021-01-101-8/+7
* Show conflict icons from children when separator is collapsed.Mikaël Capelle2021-01-031-7/+9
* Clean code and reorganize.Mikaël Capelle2021-01-021-6/+20
* Change compact size for the conflicts column to be shorter since there are le...Al2019-12-091-1/+1
* Separate conflict flags and render them in separate columnsSilarn2019-12-061-0/+36