Martin von Zweigbergk 8e47d2d66f merged_tree: add config option to write trees using new format ...

We're finally ready to start writing trees using the new format where
we represent conflicts by having multiple trees in the commit instead
of having a single tree with multiple entries at a path. This patch
adds a config option for that. It's not ready to be used yet, so I
haven't updated the release notes or other documentation.

I added only a simple CLI test for testing what happens when the
config is enabled in an existing repo. 108 tests currently fail if we
flip the default.

2023-08-30 06:17:21 -07:00

..

examples

cargo: move examples/ into cli/ so they are part of the build again

2023-08-07 21:49:45 +00:00

src

merge_tools: create builtin diff editor

2023-08-30 05:38:10 -04:00

testing

fake_diff_editor: Allow specifying extra arguments to be ignored

2023-08-21 20:19:15 -07:00

tests

merged_tree: add config option to write trees using new format

2023-08-30 06:17:21 -07:00

build.rs

build: update rerun-if conditions to watch .git/HEAD in colocated repo

2023-08-06 12:16:11 +09:00

Cargo.toml

merge_tools: create builtin diff editor

2023-08-30 05:38:10 -04:00