Skip to content
Snippets Groups Projects
Commit 58b04a538caa authored by Christian Delahousse's avatar Christian Delahousse
Browse files

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

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.
parent bec1a579ebc4
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment