Skip to content

Commit

Permalink
docs: stop mentioning meld as the default diff editor
Browse files Browse the repository at this point in the history
The default is now `:builtin`.
  • Loading branch information
ilyagr committed Apr 13, 2024
1 parent d954a1c commit 82c85ba
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 12 deletions.
11 changes: 7 additions & 4 deletions cli/src/commands/diffedit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@ use crate::ui::Ui;

/// Touch up the content changes in a revision with a diff editor
///
/// With the `-r` option, which is the default, starts a diff editor (`meld` by
/// default) on the changes in the revision.
/// With the `-r` option, which is the default, starts a [diff editor] on the
/// changes in the revision.
///
/// With the `--from` and/or `--to` options, starts a diff editor comparing the
/// "from" revision to the "to" revision.
/// With the `--from` and/or `--to` options, starts a [diff editor] comparing
/// the "from" revision to the "to" revision.
///
/// [diff editor]:
/// https://martinvonz.github.io/jj/latest/config/#editing-diffs
///
/// Edit the right side of the diff until it looks the way you want. Once you
/// close the editor, the revision specified with `-r` or `--to` will be
Expand Down
12 changes: 7 additions & 5 deletions cli/src/commands/split.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@ use crate::ui::Ui;

/// Split a revision in two
///
/// Starts a diff editor (`meld` by default) on the changes in the revision.
/// Edit the right side of the diff until it has the content you want in the
/// first revision. Once you close the editor, your edited content will replace
/// the previous revision. The remaining changes will be put in a new revision
/// on top.
/// Starts a [diff editor] on the changes in the revision. Edit the right side
/// of the diff until it has the content you want in the first revision. Once
/// you close the editor, your edited content will replace the previous
/// revision. The remaining changes will be put in a new revision on top.
///
/// [diff editor]:
/// https://martinvonz.github.io/jj/latest/config/#editing-diffs
///
/// If the change you split had a description, you will be asked to enter a
/// change description for each commit. If the change did not have a
Expand Down
10 changes: 7 additions & 3 deletions cli/tests/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -673,9 +673,11 @@ With the `--from` and/or `--to` options, shows the difference from/to the given
Touch up the content changes in a revision with a diff editor
With the `-r` option, which is the default, starts a diff editor (`meld` by default) on the changes in the revision.
With the `-r` option, which is the default, starts a [diff editor] on the changes in the revision.
With the `--from` and/or `--to` options, starts a diff editor comparing the "from" revision to the "to" revision.
With the `--from` and/or `--to` options, starts a [diff editor] comparing the "from" revision to the "to" revision.
[diff editor]: https://martinvonz.github.io/jj/latest/config/#editing-diffs
Edit the right side of the diff until it looks the way you want. Once you close the editor, the revision specified with `-r` or `--to` will be updated. Descendants will be rebased on top as usual, which may result in conflicts.
Expand Down Expand Up @@ -1713,7 +1715,9 @@ Start an editor to update the patterns that are present in the working copy
Split a revision in two
Starts a diff editor (`meld` by default) on the changes in the revision. Edit the right side of the diff until it has the content you want in the first revision. Once you close the editor, your edited content will replace the previous revision. The remaining changes will be put in a new revision on top.
Starts a [diff editor] on the changes in the revision. Edit the right side of the diff until it has the content you want in the first revision. Once you close the editor, your edited content will replace the previous revision. The remaining changes will be put in a new revision on top.
[diff editor]: https://martinvonz.github.io/jj/latest/config/#editing-diffs
If the change you split had a description, you will be asked to enter a change description for each commit. If the change did not have a description, the second part will not get a description, and you will be asked for a description only for the first part.
Expand Down

0 comments on commit 82c85ba

Please sign in to comment.