- Committer: l10n daemon script
- Date: 2021-01-05 05:38:11 UTC
- Revision ID: git-v1:adc74bb1271af30811340bc01341538a08bdbf94
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"
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"
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
cvsdiff
|
182 | 21 years ago | Otto Bruggeman | CVS_SILENT added and moved some diff files for tes |
|
||
|
diff
|
182 | 21 years ago | Otto Bruggeman | CVS_SILENT added and moved some diff files for tes |
|
||
|
perforce
|
182 | 21 years ago | Otto Bruggeman | CVS_SILENT added and moved some diff files for tes |
|
||
|
subversion
|
186 | 21 years ago | Mickael Marchand | adding svn tests for bruggie svn path=/trunk/kdes |
|
||