Yuya Nishihara 46dde130dd cli: op log/show: don't attempt to show diff from auto-merge parents ... Unfortunately, we can't reproduce a merge in bit-exact manner. The shape of the commits graphs should be identical, but commit/change ids differ. I don't think we would want to see the list of "identical" changes, so this patch disables show_op_diff() for merge operations. "op diff" is unchanged because it doesn't fail, and the diff functionality might be useful for debugging problems. Alternatively, we could show diff from the auto-merge state without rebasing descendants, but I don't think that would be useful either. The state before rebase_descendants() isn't visible to users, so it shouldn't be the stuff the user would care about. Fixes #4465		2025-06-12 00:16:21 +00:00
..
examples	store: Add Send bounds to the AsyncRead future returned by read_file	2025-06-09 21:08:10 +00:00
src	cli: op log/show: don't attempt to show diff from auto-merge parents	2025-06-12 00:16:21 +00:00
testing	diff: Run external diff tools in their temp dir	2025-05-12 21:34:19 +00:00
tests	cli: op log/show: don't attempt to show diff from auto-merge parents	2025-06-12 00:16:21 +00:00
build.rs	build: fix cargo publish by symlinking cli/docs->docs	2024-11-05 17:37:14 -08:00
Cargo.toml	cargo: Add metadata to build .deb package with cargo-deb	2025-06-08 20:18:57 +00:00
docs	build: fix cargo publish by symlinking cli/docs->docs	2024-11-05 17:37:14 -08:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00