cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-05 15:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

docs: fix syntax highlighting for conflicts.md

Browse Source 
I think the `diff` syntax highlighting makes these examples harder to
read since it's inconsistent and wouldn't appear in real conflicts.
This commit is contained in:
Scott Taylor 2025-03-02 22:35:34 -06:00 committed by Scott Taylor
parent cf3b45878e
commit a95281f9ca
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/conflicts.md
View File

@ -78,7 +78,7 @@ since Jujutsu can't figure out how to combine these changes. Therefore, Jujutsu
will materialize the conflict in the working copy using conflict markers, which will materialize the conflict in the working copy using conflict markers, which
would look like this: would look like this:
```diff ```text
<<<<<<< Conflict 1 of 1 <<<<<<< Conflict 1 of 1
%%%%%%% Changes from base to side #1 %%%%%%% Changes from base to side #1
apple apple
@ -123,7 +123,7 @@ If you prefer to just see the contents of each side of the conflict without the
diff, Jujutsu also supports a "snapshot" style, which can be enabled by setting diff, Jujutsu also supports a "snapshot" style, which can be enabled by setting
the `ui.conflict-marker-style` config option to "snapshot": the `ui.conflict-marker-style` config option to "snapshot":
```diff ```text
<<<<<<< Conflict 1 of 1 <<<<<<< Conflict 1 of 1
+++++++ Contents of side #1 +++++++ Contents of side #1
apple apple
@ -145,7 +145,7 @@ Some tools expect Git-style conflict markers, so Jujutsu also supports [Git's
conflict markers by setting the `ui.conflict-marker-style` config option to conflict markers by setting the `ui.conflict-marker-style` config option to
"git": "git":
```diff ```text
<<<<<<< Side #1 (Conflict 1 of 1) <<<<<<< Side #1 (Conflict 1 of 1)
apple apple
grapefruit grapefruit
@ -173,7 +173,7 @@ conflict marker. To ensure that it's always unambiguous which lines are conflict
markers and which are just part of the file contents, `jj` sometimes uses markers and which are just part of the file contents, `jj` sometimes uses
conflict markers which are longer than normal: conflict markers which are longer than normal:
```diff ```text
<<<<<<<<<<<<<<< Conflict 1 of 1 <<<<<<<<<<<<<<< Conflict 1 of 1
%%%%%%%%%%%%%%% Changes from base to side #1 %%%%%%%%%%%%%%% Changes from base to side #1
-Heading -Heading
@ -203,7 +203,7 @@ character, and one person changed `grape` to `grapefruit`, while another person
added the missing newline character to make `grape\n`, the resulting conflict added the missing newline character to make `grape\n`, the resulting conflict
would look like this: would look like this:
```diff ```text
<<<<<<< Conflict 1 of 1 <<<<<<< Conflict 1 of 1
+++++++ Contents of side #1 (no terminating newline) +++++++ Contents of side #1 (no terminating newline)
grapefruit grapefruit