Home
last modified time | relevance | path

Searched refs:CONFLICT_RE (Results 1 - 1 of 1) sorted by relevance

/third_party/node/
H A DMakefile1567 CONFLICT_RE=^>>>>>>> [[:xdigit:]]+|^<<<<<<< [[:alpha:]]+ macro
1571 @if ! ( grep -IEqrs "$(CONFLICT_RE)" --exclude="error-message.js" --exclude="merge-conflict.json" benchmark deps doc lib src test tools ) \
1572 && ! ( $(FIND) . -maxdepth 1 -type f | xargs grep -IEqs "$(CONFLICT_RE)" ); then \

Completed in 3 milliseconds