jj/cli
Ilya Grigoriev 9be159342c config.md: advertise diffedit3 as an alternative to meld-3 diff editor
This is instead of https://github.com/martinvonz/jj/pull/3292, which would make
`diffedit3` built into `jj`. I still have some hope of eventually making
`diffedit3` into the default diff editor that is available without any
configuration, which probably requires building it into `jj`, but this may not
happen, and it wouldn't hurt to test `diffedit3` 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` with `jj` without combining them in a
single binary.
2024-05-08 11:38:41 -07:00
..
examples revset: support custom filter extensions 2024-05-06 10:42:01 -04:00
src config.md: advertise diffedit3 as an alternative to meld-3 diff editor 2024-05-08 11:38:41 -07:00
testing revset: add support for file(kind:pattern) syntax 2024-04-07 19:43:29 +09:00
tests conflicts.rs: label conflict number and sides next to conflict markers 2024-05-05 18:42:14 -07:00
build.rs
Cargo.toml cargo: explicitly indicate paths to publish 2024-04-15 20:37:00 -07:00
LICENSE