projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 586c46f) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 19 Feb 2017 04:52:02 +0000 (05:52 +0100)
committerl10n daemon script <scripty@kde.org>
Sun, 19 Feb 2017 04:52:02 +0000 (05:52 +0100)
commitb9b0e1f274d3022d60e3a9ce704dcfe8c88cf919
tree70668fa7eca573cbdcc4a9d690d05ae37af2c654tree | snapshot
parent586c46fbf63486ad8e40691f21aaa83e3df50cf1commit | 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;