view tests/histedit-helpers.sh @ 17394:19e4861f9730 stable

tests: merging bookmarked heads

45b5eb2941d0 fixed an error that occured when heads being merged were both
inactive bookmarks. Add a test for that case.

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