Skip to content
Snippets Groups Projects
Commit 9ca16368 authored by Jacob Beyer's avatar Jacob Beyer
Browse files

Merge branch 'merge_conflict'

parents 54325527 13a6a669
No related branches found
No related tags found
No related merge requests found
...@@ -12,3 +12,8 @@ This line will be marked as the merge-conflict from master/HEAD ...@@ -12,3 +12,8 @@ This line will be marked as the merge-conflict from master/HEAD
As can be seen, only the part which actually changes will be marked during the As can be seen, only the part which actually changes will be marked during the
merge conflict, the rest of the texts are outside of the merge scope. merge conflict, the rest of the texts are outside of the merge scope.
# Added in merge-conflicts
This text was added in the merge-conflicts file. It will be appearing in the
resulting file, as it is a change only in one file, with nothing opposing it
from the other branch.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment