strip-conflict: Add -h to grep(1) to suppress filenames

If several files was specified, grep prefixes every line with the file
name, that's stdout pollution.

b1bf8578-a042-11e3-a580-001f3b596ec9