Commit 96382a2

xxwhirlpool  ·  2026-03-16 13:23:45 -0400 EDT
parent 328ec15 
gitcheck
1 files changed,  +11, -0
A config/.local/bin/gitcheck
A config/.local/bin/gitcheck
+11, -0
......@@ -0,0 +1,11 @@
1+#!/usr/bin/env bash
2+#
3+# view files with merge conflict markers
4+
5+if [[ ! "$(command -v batcat)" ]]; then
6+ less_cmd="cat"
7+else
8+ less_cmd="batcat"
9+fi
10+
11+git diff --staged --check | grep -i conflict | "$less_cmd"