diff --check: detect leftover conflict markers