--- a/contrib/editmerge	Mon Oct 19 16:01:55 2015 +0200
+++ b/contrib/editmerge	Mon Oct 19 21:36:12 2015 -0700
@@ -40,7 +40,7 @@
   # open the editor to the first conflict until there are no more
   # or the user stops editing the file
   while [ ! "$FIRSTLINE" = "" ] && [ ! "$FIRSTLINE" = "$PREVIOUSLINE" ] ; do
-    "$ED" "+$FIRSTLINE" "$FILE"
+    $ED "+$FIRSTLINE" "$FILE"
     PREVIOUSLINE="$FIRSTLINE"
     FIRSTLINE="$(getlines | head -n 1)"
   done