# HG changeset patch
# User Ryan McElroy <rmcelroy@fb.com>
# Date 1445315772 25200
# Node ID 612502900a2dcaff7b77a57db60393eebe797ab9
# Parent  ed41ce89822d4b6c7875ffe63f96fa260752f230
editmerge: dequote other use of $ED

We want to support editors with parameters, eg EDITOR="vim -O" or whatever.
So remove the quotes from around $ED and assume that the editor variable is
properly escaped already.

diff -r ed41ce89822d -r 612502900a2d contrib/editmerge
--- 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