projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 173873d) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 4 Mar 2017 07:09:59 +0000 (08:09 +0100)
committerl10n daemon script <scripty@kde.org>
Sat, 4 Mar 2017 07:09:59 +0000 (08:09 +0100)
commitba9832bfb68fcd25631a74eb91095e409884d09e
treec1baf1267ec56682dd2db596c443fb52ae97c0actree | snapshot
parent173873dc9c74c62426131d1d6cab537ea17e1da5commit | 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;