]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 94b2b2a) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 9 Jan 2018 03:56:51 +0000 (04:56 +0100)
committerl10n daemon script <scripty@kde.org>
Tue, 9 Jan 2018 03:56:51 +0000 (04:56 +0100)
commitc2f6e5d669a002c1ee7bf77ba8e16a545bec171d
tree7a0d2d874dbaf0dcba21e3414b18baa60ff7a0a6tree
parent94b2b2a2dbd3b861f74277b273ab268f28e8678acommit | 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 diff | blob | blame | history