Skip to content

Use git difftool for merge.tool identifiers #900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 18, 2025
Merged

Use git difftool for merge.tool identifiers #900

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions lib/thor/shell/basic.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading