Show More
| @@ -40,7 +40,7 b' if [ "$ED" = "emacs" ] || [ "$ED" = "nan' | |||
|
|
40 | 40 | # open the editor to the first conflict until there are no more |
|
|
41 | 41 | # or the user stops editing the file |
|
|
42 | 42 | while [ ! "$FIRSTLINE" = "" ] && [ ! "$FIRSTLINE" = "$PREVIOUSLINE" ] ; do |
|
|
43 |
|
|
|
|
43 | $ED "+$FIRSTLINE" "$FILE" | |
|
|
44 | 44 | PREVIOUSLINE="$FIRSTLINE" |
|
|
45 | 45 | FIRSTLINE="$(getlines | head -n 1)" |
|
|
46 | 46 | done |
General Comments 0
You need to be logged in to leave comments.
Login now