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(' ')")