mirror of
https://github.com/jj-vcs/jj.git
synced 2025-12-23 06:01:01 +00:00
I'm testing simple conflicts diffs locally, and we'll probably need to handle consecutive context hunks when we add some form of unmaterialized conflicts diffs. Let's buffer context hunks (up to 1 right now.) The new code looks simpler. |
||
|---|---|---|
| .. | ||
| examples | ||
| src | ||
| testing | ||
| tests | ||
| build.rs | ||
| Cargo.toml | ||
| LICENSE | ||