facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

contrib: make editmerge look for merge markers at the beginning of the line

Browse Source 
This fix adds a caret to the start of the regex looking for merge markers. This
avoids the issue arises when you've real merge conflicts in a file that tests
for the existance of merge markers in test output. Editmerge will not open on
the fake/tested merge markers because they'll be indented in.
This commit is contained in:
Christian Delahousse 2015-10-16 15:01:42 -07:00
parent 4c1f5709e1
commit c021a178a2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/editmerge
View File

@ -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