From 77ceaa058265611aecf0683dd19c0f19498c1731 Mon Sep 17 00:00:00 2001 From: Eike Date: Tue, 22 Apr 2025 09:06:09 +0200 Subject: [PATCH] Use git difftool if no ENV is set --- lib/thor/shell/basic.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/thor/shell/basic.rb b/lib/thor/shell/basic.rb index 71ce4071..bf1b89ef 100644 --- a/lib/thor/shell/basic.rb +++ b/lib/thor/shell/basic.rb @@ -377,11 +377,7 @@ def merge(destination, content) #:nodoc: end def merge_tool #:nodoc: - @merge_tool ||= ENV["THOR_MERGE"] || git_merge_tool - end - - def git_merge_tool #:nodoc: - `git config merge.tool`.rstrip rescue "" + @merge_tool ||= ENV["THOR_MERGE"] || "git difftool --no-index" end end end