projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 92fbe0e) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 18 Feb 2017 06:55:48 +0000 (07:55 +0100)
committerl10n daemon script <scripty@kde.org>
Sat, 18 Feb 2017 06:55:48 +0000 (07:55 +0100)
commit39136bb27900e185922a5e98d58e2d79501aec0f
treeecdcd395cd9959e8f0144c4e38455a35142f20f3tree | snapshot
parent92fbe0e41599a61ae15e53b2ed9c072d059d2db6commit | 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/analyze/gui/org.kde.heaptrack.desktop diff | blob | history
Domain: SDK / Command line tools;