##// END OF EJS Templates
resolve: fix incorrect merge...
resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

File last commit:

r17085:35729bdd default
r27025:ec372573 default
Show More
histedit-helpers.sh
6 lines | 217 B | application/x-sh | BashLexer
/ tests / histedit-helpers.sh
Augie Fackler
histedit: new extension for interactive history editing
r17064 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"
}