You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.md
+8-8Lines changed: 8 additions & 8 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,6 +1,6 @@
1
1
# jj-diffconflicts
2
2
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].
4
4
It provides a two-way diff interface to resolve merge conflicts.
5
5
It is heavily inspired by Seth House's [diffconflicts] plugin, which provides the same functionality for the Git and Mercurial version control systems.
6
6
@@ -9,8 +9,8 @@ It is heavily inspired by Seth House's [diffconflicts] plugin, which provides th
9
9
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:
10
10
11
11
- 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.
14
14
15
15
But perhaps the best way is to [try it yourself](#test-repository).
16
16
@@ -34,7 +34,7 @@ If you want to abort without resolving the conflict, exit Neovim with `:cq` inst
34
34
35
35
### Invoking through `jj resolve`
36
36
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]:
38
38
39
39
```toml
40
40
[merge-tools.diffconflicts]
@@ -60,12 +60,12 @@ If you don't want to use the history view, you can instead set `merge-args` to `
60
60
The `make-conflicts.sh` script creates a Jujutsu repository in the `testrepo` directory whose working copy has conflicted files.
61
61
It can be used to try `jj-diffconflicts` (or any other merge tool).
62
62
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.
64
64
65
65
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.
67
67
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.
69
69
It can be used to test if the merge tool can handle markers of length higher than the default value.
70
70
71
71
The fourth file is `multiple_conflicts.txt`, which contains two conflict sections.
0 commit comments