Mercurial > hg

diff contrib/editmerge @ 26804:612502900a2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Ryan McElroy <rmcelroy@fb.com>
date Mon, 19 Oct 2015 21:36:12 -0700
parents a723f900d212
children
line wrap: on
line diff
--- 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