projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4f74da8) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 18 Feb 2017 05:11:41 +0000 (06:11 +0100)
committerl10n daemon script <scripty@kde.org>
Sat, 18 Feb 2017 05:11:41 +0000 (06:11 +0100)
commit3423767c9250655d578588e6eae9cef5c45cce55
treec696a780268ded374c2df412a1d65afbfc7ef7datree | snapshot
parent4f74da8c6a3cbff0b224d3b254610ee4af64aca2commit | 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;