tests/histedit-helpers.sh

filemerge: deindent the parts of filemerge outside the try block

It is no longer necessary to indent these parts.

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"
}