Scott Taylor 26f5d6150c conflicts: add "git" conflict marker style ... Adds a new "git" conflict marker style option. This option matches Git's "diff3" conflict style, allowing these conflicts to be parsed by some external tools that don't support JJ-style conflicts. If a conflict has more than 2 sides, then it falls back to the similar "snapshot" conflict marker style. The conflict parsing code now supports parsing Git-style conflict markers in addition to the normal JJ-style conflict markers, regardless of the conflict marker style setting. This has the benefit of allowing the user to switch the conflict marker style while they already have conflicts checked out, and their old conflicts will still be parsed correctly. Example of "git" conflict markers: ``` <<<<<<< Side #1 (Conflict 1 of 1) fn example(word: String) { println!("word is {word}"); ||||||| Base fn example(w: String) { println!("word is {w}"); ======= fn example(w: &str) { println!("word is {w}"); >>>>>>> Side #2 (Conflict 1 of 1 ends) } ```		2024-11-23 08:28:47 -06:00
..
common	tests: set $COLUMNS when running CLI tests	2024-09-05 08:56:04 -07:00
cli-reference@.md.snap	cli: hyphenate "working-copy commit" in --ignore-working-copy help	2024-11-22 23:05:46 -08:00
runner.rs	cli: delete deprecated jj checkout command	2024-11-21 11:50:03 -06:00
test_abandon_command.rs	abandon: add --restore-descendants flag	2024-09-24 10:52:06 +02:00
test_absorb_command.rs	cli: add "absorb" machinery and command	2024-11-12 08:26:42 +09:00
test_acls.rs	diff: remove duplicated source message from AccessDenied error	2024-10-23 23:51:21 +09:00
test_advance_bookmarks.rs	everything: Rename branches to bookmarks	2024-09-11 18:54:45 +02:00
test_alias.rs	bookmark: add "b" alias	2024-09-17 18:24:26 +02:00
test_backout_command.rs	everything: Rename branches to bookmarks	2024-09-11 18:54:45 +02:00
test_bookmark_command.rs	log: emit working-copy branch first if included in the revset	2024-11-20 10:50:16 +09:00
test_builtin_aliases.rs	bookmarks: add support for git.auto-local-bookmark (to match docs)	2024-10-30 08:01:02 -07:00
test_commit_command.rs	cli: add --author argument for commit and describe	2024-09-22 12:40:46 +02:00
test_commit_template.rs	log: emit working-copy branch first if included in the revset	2024-11-20 10:50:16 +09:00
test_completion.rs	cli: git push: do not push new bookmarks by default	2024-11-19 21:11:22 +09:00
test_concurrent_operations.rs	log: emit working-copy branch first if included in the revset	2024-11-20 10:50:16 +09:00
test_config_command.rs	cli: fix "config unset" to not delete a whole table	2024-11-18 09:15:40 +09:00
test_copy_detection.rs
test_debug_command.rs	revset: reorganize expression resolution/evaluation methods	2024-11-08 10:34:02 +09:00
test_describe_command.rs	cli: get author timestamp of description template in consistent way	2024-09-24 07:17:33 +09:00
test_diff_command.rs	diff: Allow setting the default level of context in config.	2024-10-25 17:56:56 +01:00
test_diffedit_command.rs	diffedit: add --restore-descendants flag	2024-09-24 09:30:28 +02:00
test_duplicate_command.rs	rewrite: fix duplicated commits to be rebased onto destination	2024-11-21 10:49:51 +09:00
test_edit_command.rs	Enable the new graph nodes by default.	2024-07-16 12:54:24 +02:00
test_evolog_command.rs	templates: Add new template alias builtin_log_compact_full_description	2024-10-26 14:01:18 -03:00
test_file_annotate_command.rs	cli: don't use format_*() in annotate template, truncate author, omit commit id	2024-11-05 14:49:57 +09:00
test_file_chmod_command.rs	cli: reorder updating and reporting for consistency.	2024-09-22 15:02:21 +01:00
test_file_show_command.rs	tests: rename test_file_print_command.rs to_file_show_command.rs	2024-10-04 20:52:59 +09:00
test_file_track_untrack_commands.rs	cli: make paths to auto-track configurable, add jj track	2024-09-09 07:49:55 -07:00
test_fix_command.rs	cli: include commit summary when attempting to modify an immutable commit	2024-11-12 01:17:41 +08:00
test_generate_md_cli_help.rs
test_git_clone.rs	cli: warn if trunk() cannot be resolved after each transaction	2024-11-15 18:31:28 +08:00
test_git_colocated.rs	log: emit working-copy branch first if included in the revset	2024-11-20 10:50:16 +09:00
test_git_fetch.rs	log: emit working-copy branch first if included in the revset	2024-11-20 10:50:16 +09:00
test_git_import_export.rs	templates: make op_summary more readable	2024-10-13 20:06:03 -07:00
test_git_init.rs	bookmarks: add support for git.auto-local-bookmark (to match docs)	2024-10-30 08:01:02 -07:00
test_git_private_commits.rs	cli: git push: do not push new bookmarks by default	2024-11-19 21:11:22 +09:00
test_git_push.rs	cli: delete deprecated jj checkout command	2024-11-21 11:50:03 -06:00
test_git_remotes.rs	everything: Rename branches to bookmarks	2024-09-11 18:54:45 +02:00
test_git_submodule.rs
test_gitignores.rs	everything: Rename branches to bookmarks	2024-09-11 18:54:45 +02:00
test_global_opts.rs	settings: simply forward .get_<type>(key) to .get::<type>(key)	2024-11-23 10:20:27 +09:00
test_help_command.rs	help: Add a keyword feature	2024-10-31 16:55:18 -03:00
test_immutable_commits.rs	cli: delete the deprecated jj move command	2024-11-18 13:24:16 -08:00
test_init_command.rs	bookmarks: add support for git.auto-local-bookmark (to match docs)	2024-10-30 08:01:02 -07:00
test_interdiff_command.rs	cli: delete deprecated jj checkout command	2024-11-21 11:50:03 -06:00
test_log_command.rs	log: emit working-copy branch first if included in the revset	2024-11-20 10:50:16 +09:00
test_new_command.rs	cli: delete deprecated jj merge command	2024-11-21 11:50:03 -06:00
test_next_prev_commands.rs	log: emit working-copy branch first if included in the revset	2024-11-20 10:50:16 +09:00
test_operations.rs	log: emit working-copy branch first if included in the revset	2024-11-20 10:50:16 +09:00
test_parallelize_command.rs	log: emit working-copy branch first if included in the revset	2024-11-20 10:50:16 +09:00
test_rebase_command.rs	log: emit working-copy branch first if included in the revset	2024-11-20 10:50:16 +09:00
test_repo_change_report.rs	cli: rebase: extract out common print_move_commits_stats function	2024-11-12 16:04:53 +08:00
test_resolve_command.rs	cli: reorder updating and reporting for consistency.	2024-09-22 15:02:21 +01:00
test_restore_command.rs	restore: add --restore-descendants flag	2024-09-24 14:26:54 +02:00
test_revset_output.rs	cli: add pointer to the documentation in case of fileset syntax error	2024-10-04 17:09:43 +02:00
test_root.rs	formatting only: switch to Item level import ganularity	2024-08-22 14:52:54 -04:00
test_shell_completion.rs
test_show_command.rs	templates: Add new template alias builtin_log_compact_full_description	2024-10-26 14:01:18 -03:00
test_simplify_parents_command.rs	cli: simplify-parents: avoid multiple rebases of the same commits	2024-11-22 20:23:03 +08:00
test_sparse_command.rs	windows: avoid UNC paths in run_ui_editor	2024-07-04 11:30:20 +10:00
test_split_command.rs	split: do not prevent all changes from going into the first commit	2024-09-27 13:33:05 +02:00
test_squash_command.rs	log: emit working-copy branch first if included in the revset	2024-11-20 10:50:16 +09:00
test_status_command.rs	conflicts: Highlight change ids in rebase advice	2024-09-13 12:57:56 +02:00
test_tag_command.rs	everything: Rename branches to bookmarks	2024-09-11 18:54:45 +02:00
test_templater.rs	templater: add != operator as user would probably expect that it exists	2024-11-10 21:41:24 +09:00
test_undo.rs	cli: git push: do not push new bookmarks by default	2024-11-19 21:11:22 +09:00
test_unsquash_command.rs	unsquash: deprecate in favor of squash and diffedit	2024-09-26 16:34:48 +02:00
test_util_command.rs	util: add exec command for arbitrary aliases	2024-11-09 11:49:33 +01:00
test_working_copy.rs	conflicts: add "git" conflict marker style	2024-11-23 08:28:47 -06:00
test_workspaces.rs	log: emit working-copy branch first if included in the revset	2024-11-20 10:50:16 +09:00