Martin von Zweigbergk e02622b143 repo: when abandoning a working copy that a merge, recreate it ... I recently needed to test something on top of a two branches at the same time, so I created a new commit on top of both of them (i.e. a merge commit). I then ran tests and made some adjustments to the code. These adjustments belonged in one of the parent branches, so I used `jj squash --into` to squash it in there. Unfortunately, that meant that my working copy became a single-parent commit based on one of the branches only. We already had #2859 for tracking this issue. This patch changes the behavior so we create a new working-copy commit with all of the previous parents.		2024-05-29 06:54:30 -07:00
..
examples	templater: implement expect_*_arguments() as methods	2024-05-22 10:18:05 +09:00
src	dsl_util: add keyword arguments and parsing helper to FunctionCallNode	2024-05-29 22:36:15 +09:00
testing
tests	repo: when abandoning a working copy that a merge, recreate it	2024-05-29 06:54:30 -07:00
build.rs
Cargo.toml	cargo: explicitly indicate paths to publish	2024-04-15 20:37:00 -07:00
LICENSE