diff_tools/untime.awk.orig

   1 # remove time stamp
   2 /^--- stock_/  { print $1 " " $2; next; }
   3 /^+++ modded_/ { print $1 " " $2; next; }
   4
   5 # convert obsolete form
   6 <<<<<<< HEAD
   7 /^diff -Npru /  { sub(/diff -Npru /, "diff -NpruEbB -x '*RIL'"); }
   8 =======
   9 /^diff -Npru /  { sub(/diff -Npru /, "diff -NpruEbB "); }
  10 >>>>>>> 8eeacfd1100094a85b7d00894fae260b7eacb37b
  11 /stock-/  { sub(/stock-/, "stock_"); sub(/modded-/, "modded_"); print; next; }
  12
  13 # keep rest of file as is:
  14 { print; }