Changeset a9fff64


Ignore:
Timestamp:
02/28/14 09:08:27 (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
4f9718b
Parents:
a3560cd
Message:

Add check to etcmerge, skip files we have nuked during merge

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-updatemanager/etcmerge

    rb95e8a8 ra9fff64  
    120120        fi 
    121121        for i in $(cat *.conflicts 2> /dev/null); do 
     122            if [ ! -e "etc-merged/$i" ] ; then continue ; fi 
    122123            if egrep -q '^(<<<<<<< |=======$|>>>>>>> )' etc-merged/$i; then 
    123124                echo "Unresolved conflicts in ${i}" 1>&2 
Note: See TracChangeset for help on using the changeset viewer.