#!/bin/sh # Usage: git-conflicts # Show list of files in a conflict state. git ls-files -u | awk '{print $4}' | sort -u