| changeset 26743 | 58b04a538caa |
| parent 26421 | 4b0fc75f9403 |
| child 26771 | a723f900d212 |
--- a/contrib/editmerge Fri Oct 09 21:44:54 2015 -0700 +++ b/contrib/editmerge Fri Oct 16 15:01:42 2015 -0700 @@ -13,7 +13,7 @@ FILE=$1 getlines() { - grep -n "<<<<<<" $FILE | cut -f1 -d: + grep -n "^<<<<<<" $FILE | cut -f1 -d: } # editor preference loosely based on https://mercurial-scm.org/wiki/editor