Code

difftool--helper: Remove use of the GIT_MERGE_TOOL variable