projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 601e7f4) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 15 Feb 2017 05:12:24 +0000 (06:12 +0100)
committerl10n daemon script <scripty@kde.org>
Wed, 15 Feb 2017 05:12:24 +0000 (06:12 +0100)
commitdbe2050ac692586877a1430ed5fbd1689e9bf6fa
tree300ca9c280f70774505cc4606dd00853b3e8a381tree | snapshot
parent601e7f466c8f3d4e3b75296d9392d1c43b5f50e0commit | 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;