]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 34eb943)
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 26 May 2024 01:17:41 +0000 (01:17 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 26 May 2024 01:17:41 +0000 (01:17 +0000)
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"


No differences found