diff options
author | Seth House <seth@eseth.com> | 2021-02-09 13:07:11 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-02-09 14:09:16 -0800 |
commit | de8dafbada811bc1bc8e1288541931f3c5406231 (patch) | |
tree | b565c165746b15098384e4578f977c16d894a2d1 /mergetools/ecmerge | |
parent | mergetool: add hideResolved configuration (diff) | |
download | tgif-de8dafbada811bc1bc8e1288541931f3c5406231.tar.xz |
mergetool: break setup_tool out into separate initialization function
This is preparation for the following commit where we need to source the
mergetool shell script to look for overrides before `run_merge_tool` is
called. Previously `run_merge_tool` both sourced that script and invoked
the mergetool.
In the case of the following commit, we need the result of the
`hide_resolved` override, if present, before we actually run
`run_merge_tool`.
The new `initialize_merge_tool` wrapper is exposed and documented as
a public interface for consistency with the existing `run_merge_tool`
which is also public. Although `setup_tool` could instead be exposed
directly, the related `setup_user_tool` would probably also want to be
elevated to match and this felt the cleanest to me.
Signed-off-by: Seth House <seth@eseth.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/ecmerge')
0 files changed, 0 insertions, 0 deletions