1. 05 Dec, 2019 2 commits
    • Thong Kuah's avatar
      Search for conflict headers everywhere · fbd3a476
      Thong Kuah authored
      We seem to have restricted to only no haml, nor js, nor rb because we
      can rely on tests. But since the new scripts is orders of magnitude
      faster, we can include all files by default.
      
      We need to exclude two files for now as these have conflict headers as
      part of their tests.
      fbd3a476
    • Thong Kuah's avatar
      Use git grep to search for conflict headers · b15d9941
      Thong Kuah authored
      `grep -z` isn't supported in MacOS grep.
      
      Also the script doesn't seem to catch some cases probably because of
      `xargs -0`
      b15d9941
  2. 04 Dec, 2019 38 commits