3 lines
73 B
Text
3 lines
73 B
Text
@option no-default-conflict
|
|
@conflict ${CONFLICT_MARKER}
|
|
@bin bin/fossil
|
@option no-default-conflict
|
|
@conflict ${CONFLICT_MARKER}
|
|
@bin bin/fossil
|