Muir Manders e955a5eda2 filemerge: add start of simple merge tool DSL ... Summary: A user wants to use a different merge tool for delete+modified conflicts. The current merge tools are not flexible or composable enough to handle this. For example, even if we added a ":delete-keep-local" tool, there is no way to specify the fallback merge tool to use for other kinds of conflicts. In this diff I introduce a simple DSL to solve the above problem. I called it "merge tool script". It only supports the "if" function, and "isabsent" to test of the "local" or "other" file context is absent/deleted. Reviewed By: zzl0 Differential Revision: D46163270 fbshipit-source-id: 28f2579e665dc9dd66ab816b10e0b7a758e772f5		2023-06-04 22:40:24 -07:00
..
fs	unfork and update toml-5	2023-06-02 08:04:49 -07:00
integration	merge: remove v1 merge state	2023-06-04 21:54:48 -07:00
locale
mononoke	upgrade to parking_lot-0.12.1	2023-06-02 18:45:03 -07:00
scm	filemerge: add start of simple merge tool DSL	2023-06-04 22:40:24 -07:00
test_support	asyncio loop vars for 3.10	2023-05-01 10:56:58 -07:00
test-data	test-data: remove snapshot 20190313	2022-02-04 13:50:48 -08:00
testlib	auth: don't load certs if auth proxy enabled	2023-05-09 09:53:48 -07:00
.clang-tidy	clang-tidy: disable facebook-hte-ContextDependentStaticInit	2022-11-04 15:33:50 -07:00
.gitignore	eden: wire up mac contbuild	2019-02-05 21:52:30 -08:00
.mononoke_test_file	test push	2022-01-06 05:57:35 -08:00
Eden.project.toml