Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
editmerge: dequote other use of $ED
authorRyan McElroy <rmcelroy@fb.com>
Mon, 19 Oct 2015 21:36:12 -0700
changeset 26804 612502900a2d
parent 26803 ed41ce89822d
child 26805 e999ed2192ef
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.
contrib/editmerge file | annotate | diff | comparison | revisions 
--- 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
mercurial