SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source

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"

...

This commit is contained in:

l10n daemon script 2017-04-09 05:32:55 +02:00

parent 91002a6386

commit b62c8fb401

7 changed files with 310 additions and 310 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files