Skip to content
Navigation Menu
Sign in
Products
Platform
GitHub
Repository hosting, code review, and collaboration
Copilot
AI coding agent for tasks, projects and automated work
Build & Ship
Actions
CI/CD and automation
Code Quality
Quality analysis, fixes, and enforcement
Codespaces
Cloud development environments
Secure
Code Security
Vulnerability detection and remediation
Secret Protection
Secret scanning and leak prevention
All Features
Developers
Learn
Documentation
Training
Certifications
Build
Build with Copilot
Customize Copilot
Integrations
Explore
Trending repos
GitHub Sponsors
Developer articles
Changelog
Changelog
Your source for the latest features, improvements, and fixes across GitHub products, all in one place.
Businesses
By Stage
Enterprises
Team
Startups
Nonprofits
By Industry
Healthcare
Financial services
Manufacturing
Government
See all industries
Evaluate GitHub
Why GitHub
Customer Stories
Business insights
Trust Center
Add-ons
GitHub Advanced Security
Enterprise-grade code security
Copilot for business
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
Resources
Learn & Connect
Documentation
Resource center
Blog
Events & webinars
Community Forum
Customer Stories
Integrations
Support
Customer support
Training
GitHub Status
Company
About
Partners
Changelog
GitHub Universe
GitHub Universe
The event for developers, by developers — talks, workshops, and what’s next for GitHub.
Pricing
Search
/
Sign in
Sign up
Appearance settings
You signed in with another tab or window.
Reload
to refresh your session.
You signed out in another tab or window.
Reload
to refresh your session.
You switched accounts on another tab or window.
Reload
to refresh your session.
Dismiss alert
{{ message }}
git
git
Repository navigation
Code
Pull requests
411
(411)
Actions
Security and quality
32
(32)
Insights
More
items
Commits
Breadcrumbs
History for
git
mergetools
tkdiff
on
master
User selector
All users
Datepicker
All time
Commit history
Commits on Apr 3, 2022
mergetools: add description to all diff/merge tools
Show description for 980145f
greenfoo
authored and
gitster
committed
980145f
View commit details
Copy full SHA for 980145f
View code at this point
Browse repository at this point
Commits on Nov 29, 2016
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
Show description for 7c10605
davvid
authored and
gitster
committed
7c10605
View commit details
Copy full SHA for 7c10605
View code at this point
Browse repository at this point
Commits on Aug 19, 2011
mergetool--lib: Refactor tools into separate files
Show description for bc7a96a
davvid
authored and
gitster
committed
bc7a96a
View commit details
Copy full SHA for bc7a96a
View code at this point
Browse repository at this point
Loading
You can’t perform that action at this time.