@@ -15,7 +15,7 @@ impl Merge {
15
15
"The limit is actually squared, so 1000 stands for up to 1 million diffs if fuzzy rename tracking is enabled" ,
16
16
) ;
17
17
/// The `merge.renames` key.
18
- #[ cfg( feature = "blob- merge" ) ]
18
+ #[ cfg( feature = "merge" ) ]
19
19
pub const RENAMES : super :: diff:: Renames = super :: diff:: Renames :: new_renames ( "renames" , & config:: Tree :: MERGE ) ;
20
20
/// The `merge.renormalize` key
21
21
pub const RENORMALIZE : keys:: Boolean = keys:: Boolean :: new_boolean ( "renormalize" , & Tree :: MERGE ) ;
@@ -31,7 +31,7 @@ impl Merge {
31
31
pub const DRIVER_RECURSIVE : keys:: String = keys:: String :: new_string ( "recursive" , & config:: Tree :: MERGE )
32
32
. with_subsection_requirement ( Some ( SubSectionRequirement :: Parameter ( "driver" ) ) ) ;
33
33
/// The `merge.conflictStyle` key.
34
- #[ cfg( feature = "blob- merge" ) ]
34
+ #[ cfg( feature = "merge" ) ]
35
35
pub const CONFLICT_STYLE : ConflictStyle =
36
36
ConflictStyle :: new_with_validate ( "conflictStyle" , & config:: Tree :: MERGE , validate:: ConflictStyle ) ;
37
37
}
@@ -44,24 +44,24 @@ impl Section for Merge {
44
44
fn keys ( & self ) -> & [ & dyn Key ] {
45
45
& [
46
46
& Self :: RENAME_LIMIT ,
47
- #[ cfg( feature = "blob- merge" ) ]
47
+ #[ cfg( feature = "merge" ) ]
48
48
& Self :: RENAMES ,
49
49
& Self :: RENORMALIZE ,
50
50
& Self :: DEFAULT ,
51
51
& Self :: DRIVER_NAME ,
52
52
& Self :: DRIVER_COMMAND ,
53
53
& Self :: DRIVER_RECURSIVE ,
54
- #[ cfg( feature = "blob- merge" ) ]
54
+ #[ cfg( feature = "merge" ) ]
55
55
& Self :: CONFLICT_STYLE ,
56
56
]
57
57
}
58
58
}
59
59
60
60
/// The `merge.conflictStyle` key.
61
- #[ cfg( feature = "blob- merge" ) ]
61
+ #[ cfg( feature = "merge" ) ]
62
62
pub type ConflictStyle = keys:: Any < validate:: ConflictStyle > ;
63
63
64
- #[ cfg( feature = "blob- merge" ) ]
64
+ #[ cfg( feature = "merge" ) ]
65
65
mod conflict_style {
66
66
use crate :: { bstr:: BStr , config, config:: tree:: sections:: merge:: ConflictStyle } ;
67
67
use gix_merge:: blob:: builtin_driver:: text;
@@ -87,7 +87,7 @@ mod conflict_style {
87
87
}
88
88
}
89
89
90
- #[ cfg( feature = "blob- merge" ) ]
90
+ #[ cfg( feature = "merge" ) ]
91
91
mod validate {
92
92
use crate :: {
93
93
bstr:: BStr ,
0 commit comments