We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent bdc8d9a commit b0edfbcCopy full SHA for b0edfbc
lib/thor/shell/basic.rb
@@ -377,21 +377,7 @@ def merge(destination, content) #:nodoc:
377
end
378
379
def merge_tool #:nodoc:
380
- @merge_tool ||= ENV["THOR_MERGE"] || git_merge_tool
381
- end
382
-
383
- def git_merge_tool
384
- tool = `git config merge.tool`.strip
385
- return "" if tool.empty?
386
387
- custom = `git config --get mergetool.#{tool}.cmd`.strip
388
- return custom unless custom.empty?
389
390
- return tool if system("command -v #{Shellwords.escape(tool)} > /dev/null 2>&1")
391
392
- "git mergetool --no-prompt --tool=#{tool}"
393
- rescue
394
- ""
+ @merge_tool ||= ENV["THOR_MERGE"] || "git difftool --no-index"
395
396
397
0 commit comments