projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8131580) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 17 Feb 2017 06:27:36 +0000 (07:27 +0100)
committerl10n daemon script <scripty@kde.org>
Fri, 17 Feb 2017 06:27:36 +0000 (07:27 +0100)
commit79ee3500a16f4e005a169c49aa0e490135d54ea8
tree29746e72435fbe3a8fd0481fefc6b28e72818f08tree | snapshot
parent8131580bc05254948eb331f76dc4a566e74cbefccommit | 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;