Changes between Version 1 and Version 2 of merge

Show
Ignore:
Timestamp:
10/29/10 10:14:15 (7 years ago)
Author:
acher
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • merge

    v1 v2  
    44 
    55 
    6 '''merge''' ''mode'' fm1 fm2 ... fmn  
     6'''merge''' ''mode'' sfm  
    77 
    88''mode'' can be: 
     
    1313  * '''diff''' 
    1414 
    15 fm1, fm2, ..., fmn is either a feature model or a set of feature models. 
     15sfm is a set of feature models, for example, you can use the following notation  
     16 
     17{{{ { fm1, fm2, ..., fmn } }}} to represent a set of feature models fm1, fm2, ..., fmn. 
     18 
     19You can also use this notation: 
     20{{{ fm* }}} that represents a set of variables whose name begins with {{{fm}}} 
    1621 
    1722