##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

editmerge: dequote other use of $ED...
Ryan McElroy -
r26804:61250290 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -40,7 +40,7 b' if [ "$ED" = "emacs" ] || [ "$ED" = "nan'
40 # open the editor to the first conflict until there are no more
40 # open the editor to the first conflict until there are no more
41 # or the user stops editing the file
41 # or the user stops editing the file
42 while [ ! "$FIRSTLINE" = "" ] && [ ! "$FIRSTLINE" = "$PREVIOUSLINE" ] ; do
42 while [ ! "$FIRSTLINE" = "" ] && [ ! "$FIRSTLINE" = "$PREVIOUSLINE" ] ; do
43 "$ED" "+$FIRSTLINE" "$FILE"
43 $ED "+$FIRSTLINE" "$FILE"
44 PREVIOUSLINE="$FIRSTLINE"
44 PREVIOUSLINE="$FIRSTLINE"
45 FIRSTLINE="$(getlines | head -n 1)"
45 FIRSTLINE="$(getlines | head -n 1)"
46 done
46 done
General Comments 0
You need to be logged in to leave comments. Login now