4 ms·find .git/ -name '*conflict*' There ya go.by jlgaddis 7y agofind .git/ -name '*conflict*' There ya go.