File tree 1 file changed +3
-3
lines changed
1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -32,10 +32,10 @@ impl TryFrom<&str> for MergeStrategy {
32
32
/// If `source` and `target` are tables and a specific key exists in both, the conflict will be
33
33
/// resolved as follows:
34
34
/// 1) If value under the conflicting key in either `source` or `target` is not a table, the value
35
- /// in `target` will be overridden with the value from `source`. This means that no keys from
36
- /// subtables under the conflicting key will be preserved.
35
+ /// in `target` will be overridden with the value from `source`. This means that no keys from
36
+ /// subtables under the conflicting key will be preserved.
37
37
/// 2) If values under the conflicting key in both `source` and `target` are tables,
38
- /// the conflict will be resolved with one of two strategies defined by `source`:
38
+ /// the conflict will be resolved with one of two strategies defined by `source`:
39
39
/// a) If `source` have a key `merge-strategy` with value `override`, the value in `target` will
40
40
/// be overridden with the value from `source`.
41
41
/// b) If `source` have a key `merge-strategy` with value `merge`, the value in `target` will be
You can’t perform that action at this time.
0 commit comments