2 commits

Author	SHA1	Message	Date
Yuya Nishihara	20bed8f80e	cli: pass UserSettings in to merge_tools::get_*_from_settings() explicitly ... editor_name_from_settings() needs &mut Ui to show hint, but we're lucky that the caller has a clone of UserSettings. This is one reason I want to remove ui.settings(). A function taking (&mut Ui, &UserSettings) sounds reasonable, but we can't pass in (&mut ui, ui.settings()) to it.	2023-01-05 07:56:03 +09:00
Ilya Grigoriev	dac80ef88c	Rename diff_edit.rs to merge_tools.rs ... This is important especially since we're about to rename the `touchup` command into `diffedit`.	2022-12-17 22:26:59 -08:00

Renamed from src/diff_edit.rs (Browse further)