Searched refs:CONFLICTS (Results 1 – 9 of 9) sorted by relevance
723 log "cat ${CONFLICTS}$1 > ${DESTDIR}$1"724 cat ${CONFLICTS}$1 > ${DESTDIR}$1 2>&3740 install_dirs $NEWTREE $CONFLICTS $1744 ' $DESTDIR/$1 $NEWTREE/$1 > $CONFLICTS/$1898 install_dirs $NEWTREE $CONFLICTS $1899 log "diff3 -m ${DESTDIR}$1 ${CONFLICTS}$1"902 ${CONFLICTS}$1918 egrep -q '^(<{7}|\|{7}|={7}|>{7}) ' $CONFLICTS/$1947 diff -u ${DESTDIR}$1 ${CONFLICTS}$1950 $EDITOR ${CONFLICTS}$1[all …]
61 CONFLICTS=$WORKDIR/conflicts72 rm -rf $OLD $NEW $TEST $CONFLICTS99 rm -rf $OLD $NEW $TEST $CONFLICTS181 if ! [ -f $CONFLICTS/$1 ]; then185 sum=`md5 -q $CONFLICTS/$1`196 if [ -f $CONFLICTS/$1 ]; then247 cat > $CONFLICTS/etc/login.conf <<EOF285 cp $TEST/etc/mail/aliases $CONFLICTS/etc/mail/aliases
61 CONFLICTS=$WORKDIR/conflicts72 rm -rf $OLD $NEW $TEST $CONFLICTS155 if ! [ -f $CONFLICTS/$1 ]; then159 sum=`md5 -q $CONFLICTS/$1`170 if [ -f $CONFLICTS/$1 ]; then
61 CONFLICTS=$WORKDIR/conflicts86 rm -rf $OLD $NEW $TEST $CONFLICTS260 if ! [ -f $CONFLICTS/$1 ]; then264 sum=`md5 -q $CONFLICTS/$1`275 if [ -f $CONFLICTS/$1 ]; then
61 CONFLICTS=$WORKDIR/conflicts72 rm -rf $SRC $OLD $TEST $CONFLICTS194 if ! [ -f $CONFLICTS/$1 ]; then198 sum=`md5 -q $CONFLICTS/$1`
61 CONFLICTS=$WORKDIR/conflicts72 rm -rf $OLD $NEW $TEST $CONFLICTS
61 CONFLICTS=$WORKDIR/conflicts75 rm -rf $OLD $NEW $TEST $CONFLICTS358 if ! [ -f $CONFLICTS/$1 ]; then362 sum=`md5 -q $CONFLICTS/$1`373 if [ -f $CONFLICTS/$1 ]; then
61 CONFLICTS=$WORKDIR/conflicts73 rm -rf $OLD $NEW $TEST $CONFLICTS736 if ! [ -f $CONFLICTS/$1 ]; then740 sum=`md5 -q $CONFLICTS/$1`
124 CONFLICTS= -Dsha256_init=_libecc_sha256_init \ macro134 $(CONFLICTS)