projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e8204ff) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 20 Feb 2017 06:39:42 +0000 (07:39 +0100)
committerl10n daemon script <scripty@kde.org>
Mon, 20 Feb 2017 06:39:42 +0000 (07:39 +0100)
commit67d7be2d014b478137e1755cfb8230b932c989ba
treeb9bfdde440ce5843feb7112b58016c2b6e67b00dtree | snapshot
parente8204ff50d824890cd03d9aa381958094729e8c1commit | 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;