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"

wilder-pre-rebase

l10n daemon script 11 years ago

parent ce85074194

commit e6e94ebf83

2 changed files with 2 additions and 2 deletions

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Write Preview

Loading…

Cancel

Save