Skip to content
Snippets Groups Projects
Commit 612502900a2d authored by Ryan McElroy's avatar Ryan McElroy
Browse files

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.
parent ed41ce89822d
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment