tests/histedit-helpers.sh

filemerge: don't try to copy files known to be absent

We set 'back' to None in this case, so we need to handle that as well.

fixbundle() {
    grep -v 'saving bundle' | grep -v 'saved backup' | \
        grep -v added | grep -v adding | \
        grep -v "unable to find 'e' for patching" | \
        grep -v "e: No such file or directory"
}