Scott Taylor fa7d9c09fc merge_tools: add merge-conflict-exit-codes option ... Some Git merge drivers can partially resolve conflicts, leaving some conflict markers in the output file. In that case, they exit with a code between 1 and 127 to indicate that there was a conflict remaining in the file (since Git uses a shell to run the merge drivers, and shells often use exit codes above 127 for special meanings such as exiting due to a signal): https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver We should support this convention as well, since it will allow many Git merge drivers to be used with Jujutsu, but we don't run our merge tools through a shell, so there is no reason to treat exit codes 1 through 127 specially. Instead, we let the user specify which exact exit codes should indicate conflicts. This is also better for cross-platform support, since Windows may use different exit codes than Linux for instance.		2024-12-03 20:08:31 -06:00
..
design
governance
technical
bookmarks.md	cli: git push: do not push new bookmarks by default	2024-11-19 21:11:22 +09:00
cli-reference.md
code-of-conduct.md
community_tools.md	docs/community_tools.md: add paragraph about jj-fzf	2024-11-16 23:49:03 +01:00
config.md	merge_tools: add merge-conflict-exit-codes option	2024-12-03 20:08:31 -06:00
config.toml
conflicts.md	docs: rewrite conflict marker docs to include new styles	2024-11-23 08:28:47 -06:00
contributing.md	docs: tighten the "previewing docs" section	2024-11-20 06:06:53 +01:00
design_doc_blueprint.md
design_docs.md
FAQ.md	faq: add an entry about why merge commits are often empty	2024-11-25 10:46:52 -08:00
filesets.md
git-comparison.md	docs: git blame comparison	2024-11-19 09:58:28 -08:00
git-compatibility.md	docs/git-compatibility.md: preserve working copy files when co-locating	2024-11-22 19:20:36 +01:00
github.md	cli: git push: do not push new bookmarks by default	2024-11-19 21:11:22 +09:00
glossary.md	docs: try to clarify that changes are not a first-class concept	2024-11-16 14:20:37 -08:00
index.md
install-and-setup.md	docs: clarify dynamic completion features	2024-11-29 21:22:38 +01:00
operation-log.md
related-work.md
revsets.md	revset: allow tags() to take a pattern for an argument	2024-11-20 00:47:23 +00:00
roadmap.md
sapling-comparison.md
templates.md
testimonials.md
tutorial.md	tutorial: fix conflict formatting issue	2024-11-25 16:47:59 -06:00
windows.md
working-copy.md