cli diff help: add detailed explanation of -r merge_commit

jj-vcs · Nov 21, 2023 · d8df36b · d8df36b
1 parent e3852ff
commit d8df36b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/cli/src/commands/diff.rs b/cli/src/commands/diff.rs
@@ -23,6 +23,10 @@ use crate::ui::Ui;
 #[derive(clap::Args, Clone, Debug)]
 pub(crate) struct DiffArgs {
     /// Show changes in this revision, compared to its parent(s)
+    ///
+    /// If the revision is a merge commit, this shows changes *from* the
+    /// automatic merge of the contents of all of its parents *to* the contents
+    /// of the revision itself.
     #[arg(long, short)]
     revision: Option<RevisionArg>,
     /// Show changes from this revision