config.md: advertise diffedit3
as an alternative to meld-3
diff editor
#3492
+88
−11
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is instead of #3292, which would make
diffedit3
built intojj
. I still have some hope of eventually makingdiffedit3
into the default diff editor that is available without any configuration, which probably requires building it intojj
, but this may not happen, and it wouldn't hurt to testdiffedit3
first. Some examples of concerns (see also the discussion in that PR):It is only a guess on my part that this would make a good default. The editor might not be polished enough, and most users are not used to 3-pane diff editing. I think most users would like it if they tried it, but this might be plain wrong.
There are concerns about adding a heavyweight dependency on
jj
. While I tried to make it as lightweight as possible, it still unavoidably includes a web server.There may be ways to bundle
diffedit3
withjj
without combining them in a single binary.