equal
deleted
inserted
replaced
14 |
14 |
15 getlines() { |
15 getlines() { |
16 grep -n "<<<<<<" $FILE | cut -f1 -d: |
16 grep -n "<<<<<<" $FILE | cut -f1 -d: |
17 } |
17 } |
18 |
18 |
19 # editor preference loosely based on http://mercurial.selenic.com/wiki/editor |
19 # editor preference loosely based on https://mercurial-scm.org/wiki/editor |
20 # hg showconfig is at the bottom though, since it's slow to run (0.15 seconds) |
20 # hg showconfig is at the bottom though, since it's slow to run (0.15 seconds) |
21 ED=$HGEDITOR |
21 ED=$HGEDITOR |
22 if [ "$ED" = "" ] ; then |
22 if [ "$ED" = "" ] ; then |
23 ED=$VISUAL |
23 ED=$VISUAL |
24 fi |
24 fi |