4 commits

Author	SHA1	Message	Date
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
Matt Kulukundis	8ead72e99f	formatting only: switch to Item level import ganularity	2024-08-22 14:52:54 -04:00
mlcui	3bca159b1a	fake-editor: replace expectpath with dump-path ... This allows us to assert the expected path in the test itself, rather than in the fake editor.	2024-07-02 11:15:44 +10:00
Austin Seipp	48fa821e60	cli: move src/ directory to new cli/ directory ... Summary: In preparation for unifying all workspace dependencies across all crates, let's go ahead and move the jj-cli crate into its own new directory. This will also be a nicer and more uniform layout as we add new `jj-*` crates. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Icf94e7ae5f290dc8e181215727b38ada	2023-08-04 19:00:42 -05:00

Renamed from testing/fake-editor.rs (Browse further)