Skip to content

Commit f16b14f

Browse files
committed
Automatically reformat README with mdformat
1 parent 20acec2 commit f16b14f

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# jj-diffconflicts
22

3-
`jj-diffconflicts` is a merge tool for the [Jujutsu][] version control system that runs in [Neovim][].
3+
`jj-diffconflicts` is a merge tool for the [Jujutsu] version control system that runs in [Neovim].
44
It provides a two-way diff interface to resolve merge conflicts.
55
It is heavily inspired by Seth House's [diffconflicts] plugin, which provides the same functionality for the Git and Mercurial version control systems.
66

@@ -9,8 +9,8 @@ It is heavily inspired by Seth House's [diffconflicts] plugin, which provides th
99
For explanations about why a two-way diff based on conflict markers might be more effective than a standard 3-way diff that compares file content, you can consult the following resources:
1010

1111
- The ["Why?" section][why] of the README of `whiteinge/diffconflicts`.
12-
- A [short video][] demonstrating how it works, and how it helps honing on the relevant differences between the conflicted sides.
13-
- An [article][] contrasting how different tools handle the same conflict.
12+
- A [short video] demonstrating how it works, and how it helps honing on the relevant differences between the conflicted sides.
13+
- An [article] contrasting how different tools handle the same conflict.
1414

1515
But perhaps the best way is to [try it yourself](#test-repository).
1616

@@ -34,7 +34,7 @@ If you want to abort without resolving the conflict, exit Neovim with `:cq` inst
3434

3535
### Invoking through `jj resolve`
3636

37-
To configure as a merge tool in Jujutsu, add the following to your [Jujutsu configuration][]:
37+
To configure as a merge tool in Jujutsu, add the following to your [Jujutsu configuration]:
3838

3939
```toml
4040
[merge-tools.diffconflicts]
@@ -60,12 +60,12 @@ If you don't want to use the history view, you can instead set `merge-args` to `
6060
The `make-conflicts.sh` script creates a Jujutsu repository in the `testrepo` directory whose working copy has conflicted files.
6161
It can be used to try `jj-diffconflicts` (or any other merge tool).
6262

63-
The first file is `fruits.txt`, which contains the merge conflict described in the [Conflicts][] section of Jujutsu's documentation.
63+
The first file is `fruits.txt`, which contains the merge conflict described in the [Conflicts] section of Jujutsu's documentation.
6464

6565
The second file is `poem.txt`, which contains a tricky merge conflict.
66-
When resolving it, one should keep in mind the points from the [merge tools benchmarks][] to judge its effectiveness.
66+
When resolving it, one should keep in mind the points from the [merge tools benchmarks] to judge its effectiveness.
6767

68-
The third file is `long_markers.txt`, which the contains the merge conflict described in the [Long conflict markers][] section of the Jujutsu's documentation.
68+
The third file is `long_markers.txt`, which the contains the merge conflict described in the [Long conflict markers] section of the Jujutsu's documentation.
6969
It can be used to test if the merge tool can handle markers of length higher than the default value.
7070

7171
The fourth file is `multiple_conflicts.txt`, which contains two conflict sections.
@@ -103,8 +103,8 @@ _Caveat emptor_
103103
[article]: https://www.eseth.org/2020/mergetools.html
104104
[conflicts]: https://jj-vcs.github.io/jj/latest/conflicts/#conflict-markers
105105
[diffconflicts]: https://github.com/whiteinge/diffconflicts/
106-
[jujutsu configuration]: https://jj-vcs.github.io/jj/latest/config/
107106
[jujutsu]: https://jj-vcs.github.io/jj/
107+
[jujutsu configuration]: https://jj-vcs.github.io/jj/latest/config/
108108
[long conflict markers]: https://jj-vcs.github.io/jj/latest/conflicts/#long-conflict-markers
109109
[merge tools benchmarks]: https://github.com/whiteinge/diffconflicts/blob/master/_utils/README.md#mergetool-benchmarks
110110
[neovim]: https://neovim.io/

0 commit comments

Comments
 (0)