Include folders when displaying the local metadata about a conflict.
authorCamila Ayres <hello@camilasan.com>
Wed, 11 Dec 2024 18:28:57 +0000 (19:28 +0100)
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>
Thu, 12 Dec 2024 10:44:50 +0000 (10:44 +0000)
commitff0030ec573ef4071dc21d254092b4ed1aa7278e
tree14f5bfbcc9e1609af3b7843798f795ef5b3eaf91
parentd4cb6773f5b0155ac0f3f577f09d064f50806457
Include folders when displaying the local metadata about a conflict.

Signed-off-by: Camila Ayres <hello@camilasan.com>
src/gui/caseclashfilenamedialog.cpp