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 04:01:12 +02:00

parent e1aa250e70

commit bef0612029

5 changed files with 195 additions and 195 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