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
..
examples	conflicts: add "ui.conflict-marker-style" config	2024-11-23 08:28:47 -06:00
src	merge_tools: add merge-conflict-exit-codes option	2024-12-03 20:08:31 -06:00
testing	style: inline variables into format strings	2024-10-04 22:29:13 +02:00
tests	merge_tools: add merge-conflict-exit-codes option	2024-12-03 20:08:31 -06:00
build.rs	build: fix cargo publish by symlinking cli/docs->docs	2024-11-05 17:37:14 -08:00
Cargo.toml	completion: suggest file paths incrementally	2024-12-01 11:06:36 +01:00
docs	build: fix cargo publish by symlinking cli/docs->docs	2024-11-05 17:37:14 -08:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00