Context Navigation

BuildingPackages

-              v16
+              v17
  * `global-settings-files`: A list of global settings file infos. The list elements must have the following format:
 {{{
 global_settings_file_info:      ::= path [ "keep-old" | "manual" | "mergeable" ]
+global_settings_file_info:      ::= path [ "keep-old" | "manual" | "auto-merge" ]
 }}}
    `path` is the relative path of the settings file, starting with "settings/". If no keyword is given after the path, the settings file is not included in the package. It will be created by the software or by the user. If a keyword is given, the settings file (a default version) is included in the package and it will be extracted on package activation. The keyword specifies what shall happen when the package is updated and a previous default version of the settings file has been modified by the user:
    - "keep-old": Indicates that the software can read old settings files and the user-modified file should be kept.
    - "manual": Indicates that the software may not be able to read an older file and the user may have to manually adjust it.
    - "mergeable": Indicates that the file format is simple text and a three-way merge shall be attempted.
+   - "auto-merge": Indicates that the file format is simple text and a three-way merge shall be attempted.
  * `user-settings-files`: A list of user settings file infos. The list elements must have the following format:
 {{{