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.
merging for bmerging bThis is file b1merging for bmerging bmerging for bmerging b