mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-31 16:40:22 +00:00
9ffd35caf8
I've been confused twice that rebasing an open commit so it results in conflicts doesn't show the conflicts in the log output. That's because we create a successor instead if a commit with conflicts is open. I guess I thought it would be expected that a child commit was not created. Since it seems surprising in practice, let's change it and we'll see if the new behavior is more or less surprising. |
||
|---|---|---|
| .. | ||
| test_bad_locking.rs | ||
| test_commit_builder.rs | ||
| test_commit_concurrent.rs | ||
| test_diff_summary.rs | ||
| test_evolution.rs | ||
| test_git.rs | ||
| test_index.rs | ||
| test_init.rs | ||
| test_load_repo.rs | ||
| test_merge_trees.rs | ||
| test_operations.rs | ||
| test_transaction.rs | ||
| test_view.rs | ||
| test_working_copy.rs | ||
| test_working_copy_concurrent.rs | ||