strip-conflict

   1 #!/usr/bin/env bash
   2
   3 #=======================================================================
   4 # strip-conflict
   5 # File ID: d92ddb10-a028-11e3-b37c-fefdb24f8e10
   6 # Remove Git conflict markers from files or stdin
   7 # License: GNU General Public License version 2 or later.
   8 #=======================================================================
   9
  10 grep -hvE '^(<<<<<<< |=======$|>>>>>>> )' "$@"