view tests/test-merge5.out @ 1212:ccb6201e3f28

Change grep -e to grep --all

We want to reserve -e for future use and grep compatibility.

I've changed every-match to all out of a general preference for
shorter long option names where short options don't exist.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)