master
refactor: allows to specify startup options for external shell/terminal (#1856)
feature: supports to customize diff/merge options for external diff/merge tool (#1971)