]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8c4d4b9) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 5 Jan 2021 05:38:36 +0000 (06:38 +0100)
committerl10n daemon script <scripty@kde.org>
Tue, 5 Jan 2021 05:38:36 +0000 (06:38 +0100)
commit49e8b67b7121d19a88a9e0d114f849a6c928f5cc
tree1c5be1e3b915c4fa39ce423ddd4b92934731919ftree
parent8c4d4b9a129b3b5dd54a7f6d67f2cf3059c7f404commit | diff
SVN_SILENT made messages (.desktop file) - always resolve ours

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"
src/dolphinpart.desktop.in diff | blob | blame | history