From 4caf7b8bdbf3885376d5c38abd3583860798766d Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami@samhuri.net>
Date: Thu, 23 Jul 2015 23:28:09 -0700
Subject: [PATCH] this ain't pretty but it works

---
 git-edit-conflicted-files | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100755 git-edit-conflicted-files

diff --git a/git-edit-conflicted-files b/git-edit-conflicted-files
new file mode 100755
index 0000000..113d3fe
--- /dev/null
+++ b/git-edit-conflicted-files
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+EDIT="${1:-${VISUAL:-$EDITOR}}"
+eval $EDIT $(git conflicts | ruby -e "puts ARGF.each_line.to_a.map{|l| \"'\"+l.strip+\"'\"}.join(' ')")