dots

gitcheck

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