projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2245c76) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 23 Feb 2017 07:13:09 +0000 (08:13 +0100)
committerl10n daemon script <scripty@kde.org>
Thu, 23 Feb 2017 07:13:09 +0000 (08:13 +0100)
commit237739a6b57f4c7f9e6a8fffbffbc4953ce622b9
tree740bc7f3aedfe0df4abbb6890dd3fab4b2d2ef04tree | snapshot
parent2245c765eab81083140e9e5e277ac24f62b432a9commit | 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;