[PATCH] test-conflict: change egrep into grep -E

[Alexis S. L. Carvalho]

Thus spake Patrick Mezard:
> test-conflict: change egrep into grep -E.

This had actually been changed from grep -E into egrep to work on
Solaris.

I've pushed a changeset that should make the (e)grep unnecessary.

Alexis