view tests/histedit-helpers.sh @ 23111:0dae9147c3b6 stable

help: refer ":merge3" instead of "internal:merge3" According to warning message (introduced by 38e0363dcbe0) in filemerge.py, the former should be used as official name.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 01 Nov 2014 02:43:08 +0900
parents 35729bdd59b6
children 890273343170
line wrap: on
line source

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