Mercurial > hg-stable
comparison contrib/editmerge @ 26804:612502900a2d
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 |
comparison
equal
deleted
inserted
replaced
| 26803:ed41ce89822d | 26804:612502900a2d |
|---|---|
| 38 PREVIOUSLINE="" | 38 PREVIOUSLINE="" |
| 39 | 39 |
| 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 |
| 47 else | 47 else |
| 48 $ED "$FILE" | 48 $ED "$FILE" |