Martin von Zweigbergk 5d2c0347a2 MutableRepo: add test of updating away from empty merge commit ... Merge commits are very similar to non-merge commits in jj. An empty merge commit with no description is not really different from an empty non-merge commit with no description. As we discussed on https://github.com/martinvonz/jj/issues/2859, we should not treat merge commits differently when updating away from them. This patch adds test for the current behavior (which is to leave the merge commit in place).		2024-05-29 06:54:30 -07:00
..
benches
gen-protos
proc-macros	cargo: explicitly indicate paths to publish	2024-04-15 20:37:00 -07:00
src	repo: when abandoning a working copy that a merge, recreate it	2024-05-29 06:54:30 -07:00
tests	MutableRepo: add test of updating away from empty merge commit	2024-05-29 06:54:30 -07:00
testutils	tree_builder: propagate errors from write_tree()	2024-05-22 06:46:38 -07:00
Cargo.toml	cargo: explicitly indicate paths to publish	2024-04-15 20:37:00 -07:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00