Jun Wu b36584e704 configparser: set ui.merge:interactive from ui.merge in user config ... Summary: This restores the compatibility of setting up merge tools using the `ui.merge` config while still limiting the default `editmerge` tool to interactive sessions. Reviewed By: sfilipco Differential Revision: D24377259 fbshipit-source-id: 3d2befba412b824fc985ddffa131e339644178c2		2020-10-16 18:33:06 -07:00
..
benches	Move fb-mercurial sources into an eden/scm subdirectory.	2019-11-13 16:04:48 -08:00
src	configparser: set ui.merge:interactive from ui.merge in user config	2020-10-16 18:33:06 -07:00
Cargo.toml	third-party/rust: import async-compression + update zstd	2020-09-15 07:59:53 -07:00
CMakeLists.txt	Merge fb-mercurial sources into the eden repository	2019-11-13 20:20:32 -08:00
ConfigParser.cpp	Merge fb-mercurial sources into the eden repository	2019-11-13 20:20:32 -08:00
ConfigParser.h	Move fb-mercurial sources into an eden/scm subdirectory.	2019-11-13 16:04:48 -08:00