#!/bin/sh
# Usage: git-conflicts
# Show list of files in a conflict state.
git ls-files -u | cut -f2- | sort -u