Add jane/conflicts script

ocaml-flambda · Oct 17, 2023 · a822f1d · a822f1d
1 parent 0344d33
commit a822f1d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/jane/conflicts b/jane/conflicts
@@ -0,0 +1,2 @@
+#!/bin/sh
+rg -g '!boot' '<<<<<<< [H]EAD' | cut -d/ -f1 | sort | uniq -c