SVN_SILENT made messages (.desktop file) - always resolve mine-conflict

Description

SVN_SILENT made messages (.desktop file) - always resolve mine-conflict

In case of conflict in i18n, keep the version of the branch "--accept mine-conflict"
To resolve a particular conflict, "svn resolve --accept mine-full path/to/file.desktop"

Details

Committed
scriptySep 1 2016, 10:05 AM
Parents
R883:1468658: add hebrew traslation
Branches
Unknown
Tags
Unknown