tutorial: edits to the diff editor explanation

Follows up on #3599. I also moved the discussion of other diff editors to a
footnote, as it didn't seem to fit well into the flow of the text.
This commit is contained in:
Ilya Grigoriev 2024-05-04 22:24:03 -07:00
parent 3dab92d2e9
commit 638649b435

View file

@ -441,14 +441,19 @@ Working copy now at: mrxqplyk 52a6c7fd ABCD
Parent commit : kwtuwqnm 643061ac ABC Parent commit : kwtuwqnm 643061ac ABC
``` ```
That will bring up the built-in diff editor with a diff of the changes in the That will bring up the built-in diff editor[^alternative_diff_editors] with a
"ABCD" commit. If you prefer another diff editor, such as diff of the changes in the "ABCD" commit. Expand the file by clicking on `(+)`
[Meld](https://meldmerge.org), you can configure or with right arrow, then select the sections/line to include by clicking or
[`ui.diff-editor`](config.md#editing-diffs) instead. Expand the file by using space. Once complete, press `c` to confirm changes, or `q` to exit without
clicking on `(+)` or with right arrow, then select the sections/line to include saving. You can also use the mouse to click on the menu items to see more
by clicking or using space. Once complete, press `c` to confirm changes, or `q` options (keyboard navigation is currently limited).
to exit without saving. We can also click on the menu items to see more
options. [^alternative_diff_editors]: There are many other diff editors you could use.
For example, if you have [Meld](https://meldmerge.org) installed and in the
PATH, you can use it via `jj squash -i --tool meld` or a fancier config with `jj
squash -i --tool meld-3`. You can configure the default with the
[`ui.diff-editor` option](config.md#editing-diffs); those docs also explain how
to specify a path to an executable if it is not in the PATH.
If we look at the diff of the second commit, we now see If we look at the diff of the second commit, we now see
that all three lines got capitalized: that all three lines got capitalized: