]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7df5fc8) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 11 Jun 2019 03:13:47 +0000 (05:13 +0200)
committerl10n daemon script <scripty@kde.org>
Tue, 11 Jun 2019 03:13:47 +0000 (05:13 +0200)
commit9f65f1de47510b92b2d153346f1c414c9fadac9f
treec90606301b9abde5363b246c0c12fd5c35fa15abtree
parent7df5fc8edb54153f877eed4690e77968a1b804bacommit | 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