]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4bd6e9f) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 3 Apr 2018 05:12:29 +0000 (07:12 +0200)
committerl10n daemon script <scripty@kde.org>
Tue, 3 Apr 2018 05:12:29 +0000 (07:12 +0200)
commitf4e2593aa79cdc0483121507012b2045bf2e9703
tree0edd69eac7762c248bfa1e64195d35b5ad0273b7tree
parent4bd6e9fb1397373b6c113fc25f9b4e17764a1504commit | 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/org.kde.dolphin.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphingeneral.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinnavigation.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinservices.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.desktop diff | blob | blame | history
src/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history