projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6e3cb78) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 20 Feb 2017 04:54:14 +0000 (05:54 +0100)
committerl10n daemon script <scripty@kde.org>
Mon, 20 Feb 2017 04:54:14 +0000 (05:54 +0100)
commit39fbbc5190f8a6f6c3b314a0de52ed60fb6c0595
tree2687ea8ca563475cd0599831aa21690e7fb5d3d6tree | snapshot
parent6e3cb78b86d27e7d621f055820a4a46b75247083commit | 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;