projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 64c1f32) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 16 Feb 2017 06:38:37 +0000 (07:38 +0100)
committerl10n daemon script <scripty@kde.org>
Thu, 16 Feb 2017 06:38:37 +0000 (07:38 +0100)
commit4f082308a376c19bca7a817284a7498b798155b3
treeb7dc557326fdd395d5b347a143a643cb4d2b1a99tree | snapshot
parent64c1f326ebf25bd37aa4133ed1e648d8d1b43a9fcommit | 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;