ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

docs: Fix example with Git conflicts markers

Browse source
This commit is contained in:
Fedor Sheremetyev 2024-08-02 18:05:57 +01:00 committed by Martin von Zweigbergk
parent 32b76a2c0a
commit c43096ba96
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/conflicts.md
View file

@ -62,15 +62,15 @@ style](https://git-scm.com/docs/git-merge#_how_conflicts_are_presented):
apple
grapefruit
orange
======= base
||||||| base
apple
grape
orange
||||||| right
=======
APPLE
GRAPE
ORANGE
>>>>>>>
>>>>>>> right
```
In this example, the left side changed "grape" to "grapefruit", and the right