Martin von Zweigbergk 9ffd35caf8 transaction: when checking out open commit with conflicts, create child commit ... 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.		2021-01-22 11:41:52 -08:00
..
protos	view: add tracking of "public" heads (copying Mercurial's phase concept)	2021-01-16 11:48:35 -08:00
src	transaction: when checking out open commit with conflicts, create child commit	2021-01-22 11:41:52 -08:00
tests	transaction: when checking out open commit with conflicts, create child commit	2021-01-22 11:41:52 -08:00
build.rs	protobuf: generate code at build-time	2020-12-24 01:05:17 -08:00
Cargo.toml	cargo: release 0.1.1	2021-01-03 23:06:46 -08:00