Re: MERGE_RR droppings

David Aguilar [off-list ref] writes:

quoted

Perhaps mergetool should consider a missing MERGE_RR and an empty
one the same way?

Would that test look (roughly) like this?

    if test -f "$GIT_DIR/MERGE_RR" && test -n "$(cat "$GIT_DIR/MERGE_RR")"

Hrm, would "test -s $that_file" be simpler?

    then
	files=$(git rerere remaining)
    else
	files=$(git ls-files -u | sed -e 's/^[^	]*	//' | sort -u)
    fi
    ...

If so I'll throw together a patch.