GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

- Remove filter button
- Move filter line edit to top and make it always visible
- Expand items after filtering
- No indentation for childs
- No fuzzy matching for body. Only "contains()" is used to search
- Clear button is also a QToolButton now

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Also, hide the return value if it is zero.

This reduces the external tools file a bit and makes it a bit
more readable.

Waqar Ahmed authored Feb 25, 2021 and Christoph Cullmann committed Feb 27, 2021

This commit was prepared using Kate line / hunk staging of course ;)
Signed-off-by: Waqar Ahmed <waqar.17a@gmail.com>

Waqar Ahmed authored Feb 25, 2021 and Christoph Cullmann committed Feb 27, 2021

Signed-off-by: Waqar Ahmed <waqar.17a@gmail.com>

Marcell Fülöp authored Feb 25, 2021 and Christoph Cullmann committed Feb 25, 2021

when their document does not have any views (because their tab was never activated).

BUG 433581