Martin von Zweigbergk bce8cb901f merge-tools: make :builtin materialize conflicts ... This make :builtin render conflicts as conflict markers instead of panicking. To support conflicts properly, we also need to parse the conflict markers (calling `update_from_content()`) after the user closes the editor.		2024-02-28 07:49:26 -08:00
..
examples
src	merge-tools: make :builtin materialize conflicts	2024-02-28 07:49:26 -08:00
testing	revset: ad-hoc optimization for range queries containing unwanted wanted heads	2024-02-22 23:26:29 +09:00
tests	templater: turn some integer overflow into evaluation error	2024-02-29 00:39:31 +09:00
build.rs
Cargo.toml	templater: add similarity hint to no such method/keyword errors	2024-02-28 09:03:04 +09:00
LICENSE