Verified Commit 35b59923 authored by Daniel M. Capella's avatar Daniel M. Capella
Browse files

pacdiff: Fix regression in check for merge status



Signed-off-by: Daniel M. Capella's avatarDaniel M. Capella <polyzen@archlinux.org>
parent 19ab4fac
......@@ -122,7 +122,8 @@ merge_file() {
merged="$($SUDO mktemp "$tempdir"/"$basename.merged.XXX")"
tar -xOf "$base_tar" "${file#/}" | $SUDO tee "$base" > /dev/null
if $SUDO $mergeprog "$file" "$base" "$pacfile" | $SUDO tee "$merged" > /dev/null; then
$SUDO $mergeprog "$file" "$base" "$pacfile" | $SUDO tee "$merged" > /dev/null
if [ "${PIPESTATUS[0]}" -ne "1" ]; then
msg2 "Merged without conflicts."
fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment