tests/histedit-helpers.sh

merge: rename p1 to wctx in manifestmerge

This is always a workingctx, and this name is more in line with other
functions in this module.

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