Closed rohieb closed 2 years ago
Merging #19 (3674401) into master (6a9b8f9) will increase coverage by
0.96%
. The diff coverage is100.00%
.
@@ Coverage Diff @@
## master #19 +/- ##
==========================================
+ Coverage 97.11% 98.07% +0.96%
==========================================
Files 3 3
Lines 208 208
==========================================
+ Hits 202 204 +2
+ Misses 6 4 -2
Impacted Files | Coverage Ξ | |
---|---|---|
plugin/conflict_marker.vim | 96.90% <100.00%> (ΓΈ) |
|
autoload/conflict_marker.vim | 98.96% <0.00%> (+1.03%) |
:arrow_up: |
autoload/conflict_marker/detect.vim | 100.00% <0.00%> (+7.14%) |
:arrow_up: |
Continue to review full report at Codecov.
Legend - Click here to learn more
Ξ = absolute <relative> (impact)
,ΓΈ = not affected
,? = missing data
Powered by Codecov. Last update 6a9b8f9...3674401. Read the comment docs.
Thank you.
Yay! *git-pulls master* π Do you think you could add the hacktoberfest-accepted
label to this PR or the hacktoberfest
topic to the repository to make it count for Hacktoberfest contributions?
@rohieb I added hacktoberfest-accepted
label π It should work (if I'm correct). Please check the account page.
Thank you! π
Run the marker detection autocommand in the following cases that could add conflict markers to the buffer:
when vim detects that the file in the current buffer has been changed externally (e.g. when executing a
patch --merge < my.patch
that patches the current file)when reading into the current buffer from stdin with
:read
when filtering the current buffer through a shell command with
:!%