diff --git a/git-conflicts b/git-conflicts index 9f2d907..af9969a 100755 --- a/git-conflicts +++ b/git-conflicts @@ -1,4 +1,4 @@ #!/bin/sh # Usage: git-conflicts # Show list of files in a conflict state. -git ls-files -u | awk '{print $4}' | sort -u +git ls-files -u | cut -f2- | sort -u