From 5496b7f740747ade6581c810cfa2d9af2b36b035 Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami@samhuri.net>
Date: Wed, 1 Apr 2015 11:06:51 -0700
Subject: [PATCH] support spaces in filenames in git-conflicts

---
 git-conflicts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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