view tests/histedit-helpers.sh @ 34553:0217d66846f7

merge: improve error messages for path conflicts during update

Differential Revision: https://phab.mercurial-scm.org/D782

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