Martin von Zweigbergk b84be06c08 conflicts: minimize diffs in materialized conflicts ... One advantage of our conflict marker style (compared to the usual 3-way markers) is that they provide the user with the diff between the base and one side so the user doesn't have to do that in their head (which is how I use 3-way markers anyway). However, since we currently always use the "first" side for the diff, that diff can be larger than if we had picked the other side, which makes the marker style worse than the usual 3-way markers. This has bothered me many times and it's about time we fix it.		2022-07-12 07:46:45 -07:00
..
src	conflicts: minimize diffs in materialized conflicts	2022-07-12 07:46:45 -07:00
tests	conflicts: minimize diffs in materialized conflicts	2022-07-12 07:46:45 -07:00
build.rs
Cargo.toml