projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3cb1b7f) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 18 Apr 2017 07:50:03 +0000 (09:50 +0200)
committerl10n daemon script <scripty@kde.org>
Tue, 18 Apr 2017 07:50:03 +0000 (09:50 +0200)
commit4f977a920f8ee16d78187b8d75f1590e1695b6e2
tree6b031c1c426574b70b728eb5aff101d13236ddc5tree | snapshot
parent3cb1b7fd2f4b3fd656758060582001f1e78c3e12commit | 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;