This commit is contained in:
emmett1
2017-09-22 15:18:47 +08:00
parent eed6a0e950
commit cca02fad39

View File

@@ -222,7 +222,7 @@ upcheckconflict() {
while IFS=' ' read -r line; do
pushd $ROOT_DIR
if [ -e "$line" ]; then
if [ ! "$(grep -w "$line" "$INDEX_DIR/$name/.files")" ]; then
if [ ! "$(grep -Fx "$line" "$INDEX_DIR/$name/.files")" ]; then
fileconflict+=(${line})
fi
fi