]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c96add9) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 17 Nov 2015 12:50:56 +0000 (12:50 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 17 Nov 2015 12:50:56 +0000 (12:50 +0000)
commite0dfcb9e1dc6a9dc210792231b84bd59e907366b
treef139bc1c181cac2d3e5b8f5634f7434f9b322d38tree
parentc96add9c68b0826b3657729d902bf9dd891f2a16commit | 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