Scott Taylor 542d09c6a9 merge_tools: add "$marker_length" variable ... Git supports passing the conflict marker length to merge drivers using "%L". It would be useful if we also had a way to pass the marker length to merge tools, since it would allow Git merge drivers to be used with `jj resolve` in more cases. Without this variable, any merge tool that parses or generates conflict markers could fail on files which require conflict markers longer than 7 characters. https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver		2024-12-23 08:42:10 -06:00
..
examples	gitignore: add more detail to errors on invalid pattern	2024-12-16 18:49:48 -06:00
src	merge_tools: add "$marker_length" variable	2024-12-23 08:42:10 -06:00
testing	merge_tools: add "$marker_length" variable	2024-12-23 08:42:10 -06:00
tests	merge_tools: add "$marker_length" variable	2024-12-23 08:42:10 -06:00
build.rs	build: fix cargo publish by symlinking cli/docs->docs	2024-11-05 17:37:14 -08:00
Cargo.toml	cargo: drop dependency on config crate	2024-12-10 16:08:50 +09:00
docs	build: fix cargo publish by symlinking cli/docs->docs	2024-11-05 17:37:14 -08:00
LICENSE