Chapter 'Modifier usage' of zsh-lovers.txt contains diff related
conflict markers, such as `<<< === >>>'. Hopefully, I've chosen the
proper parts to keep.
Besides I deleted trailing whitespace as well as incorporated some
punctuation characters above the corrected, aforementioned section. |