dots

commit

96382a2

parent

328ec15

author

xxwhirlpool

date

2026-03-16 13:23:45 -0400 EDT

gitcheck

 1@@ -0,0 +1,11 @@
 2+#!/usr/bin/env bash
 3+#
 4+# view files with merge conflict markers
 5+
 6+if [[ ! "$(command -v batcat)" ]]; then
 7+	less_cmd="cat"
 8+else
 9+	less_cmd="batcat"
10+fi
11+
12+git diff --staged --check | grep -i conflict | "$less_cmd"