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
..
bench-revsets-git.txt	bookmarks: update some leftover uses of the word "branch"	2024-09-11 19:19:31 -07:00
fake-diff-editor.rs
fake-editor.rs	merge_tools: add "$marker_length" variable	2024-12-23 08:42:10 -06:00
fake-formatter.rs	style: inline variables into format strings	2024-10-04 22:29:13 +02:00