René's URL Explorer Experiment


Title: GitHub - whiteinge/diffconflicts: A better Vimdiff Git mergetool

Open Graph Title: GitHub - whiteinge/diffconflicts: A better Vimdiff Git mergetool

X Title: GitHub - whiteinge/diffconflicts: A better Vimdiff Git mergetool

Description: A better Vimdiff Git mergetool. Contribute to whiteinge/diffconflicts development by creating an account on GitHub.

Open Graph Description: A better Vimdiff Git mergetool. Contribute to whiteinge/diffconflicts development by creating an account on GitHub.

X Description: A better Vimdiff Git mergetool. Contribute to whiteinge/diffconflicts development by creating an account on GitHub.

Opengraph URL: https://github.com/whiteinge/diffconflicts

X: @github

direct link

Domain: patch-diff.githubusercontent.com

route-pattern/:user_id/:repository
route-controllerfiles
route-actiondisambiguate
fetch-noncev2:e9f29bf5-6909-6e70-fade-b21bd32a341d
current-catalog-service-hashf3abb0cc802f3d7b95fc8762b94bdcb13bf39634c40c357301c4aa1d67a256fb
request-idAB9A:106C72:C20ED6:103F77D:6970491D
html-safe-nonce40eb9e19b09d060ecb40bac52d0685a1c30b01b16abb1628c4528c34201dac1a
visitor-payloadeyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJBQjlBOjEwNkM3MjpDMjBFRDY6MTAzRjc3RDo2OTcwNDkxRCIsInZpc2l0b3JfaWQiOiIyMjYxMzQ5NjYyMzUxOTY4NTQxIiwicmVnaW9uX2VkZ2UiOiJpYWQiLCJyZWdpb25fcmVuZGVyIjoiaWFkIn0=
visitor-hmace540081a9076bbc05dd91831ac02a809b8ac9fe3aec8d52deab93f09184d3874
hovercard-subject-tagrepository:141395505
github-keyboard-shortcutsrepository,copilot
google-site-verificationApib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I
octolytics-urlhttps://collector.github.com/github/collect
analytics-location//
fb:app_id1401488693436528
apple-itunes-appapp-id=1477376905, app-argument=https://github.com/whiteinge/diffconflicts
twitter:imagehttps://opengraph.githubassets.com/85231bff2110a6c0603937a25183cc6d0f0c1fe7745f0384a9a1dd11a594f5cd/whiteinge/diffconflicts
twitter:cardsummary_large_image
og:imagehttps://opengraph.githubassets.com/85231bff2110a6c0603937a25183cc6d0f0c1fe7745f0384a9a1dd11a594f5cd/whiteinge/diffconflicts
og:image:altA better Vimdiff Git mergetool. Contribute to whiteinge/diffconflicts development by creating an account on GitHub.
og:image:width1200
og:image:height600
og:site_nameGitHub
og:typeobject
hostnamegithub.com
expected-hostnamegithub.com
None9920a62ba22d06470388e2904804fb7e5ec51c9e35f81784e9191394c74b2bd2
turbo-cache-controlno-preview
go-importgithub.com/whiteinge/diffconflicts git https://github.com/whiteinge/diffconflicts.git
octolytics-dimension-user_id91293
octolytics-dimension-user_loginwhiteinge
octolytics-dimension-repository_id141395505
octolytics-dimension-repository_nwowhiteinge/diffconflicts
octolytics-dimension-repository_publictrue
octolytics-dimension-repository_is_forkfalse
octolytics-dimension-repository_network_root_id141395505
octolytics-dimension-repository_network_root_nwowhiteinge/diffconflicts
turbo-body-classeslogged-out env-production page-responsive
disable-turbofalse
browser-stats-urlhttps://api.github.com/_private/browser/stats
browser-errors-urlhttps://api.github.com/_private/browser/errors
releasef643964067a552f02067066d6a910b2f90a5721f
ui-targetfull
theme-color#1e2327
color-schemelight dark

Links:

Skip to contenthttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts#start-of-content
https://patch-diff.githubusercontent.com/
Sign in https://patch-diff.githubusercontent.com/login?return_to=https%3A%2F%2Fgithub.com%2Fwhiteinge%2Fdiffconflicts
GitHub CopilotWrite better code with AIhttps://github.com/features/copilot
GitHub SparkBuild and deploy intelligent appshttps://github.com/features/spark
GitHub ModelsManage and compare promptshttps://github.com/features/models
MCP RegistryNewIntegrate external toolshttps://github.com/mcp
ActionsAutomate any workflowhttps://github.com/features/actions
CodespacesInstant dev environmentshttps://github.com/features/codespaces
IssuesPlan and track workhttps://github.com/features/issues
Code ReviewManage code changeshttps://github.com/features/code-review
GitHub Advanced SecurityFind and fix vulnerabilitieshttps://github.com/security/advanced-security
Code securitySecure your code as you buildhttps://github.com/security/advanced-security/code-security
Secret protectionStop leaks before they starthttps://github.com/security/advanced-security/secret-protection
Why GitHubhttps://github.com/why-github
Documentationhttps://docs.github.com
Bloghttps://github.blog
Changeloghttps://github.blog/changelog
Marketplacehttps://github.com/marketplace
View all featureshttps://github.com/features
Enterpriseshttps://github.com/enterprise
Small and medium teamshttps://github.com/team
Startupshttps://github.com/enterprise/startups
Nonprofitshttps://github.com/solutions/industry/nonprofits
App Modernizationhttps://github.com/solutions/use-case/app-modernization
DevSecOpshttps://github.com/solutions/use-case/devsecops
DevOpshttps://github.com/solutions/use-case/devops
CI/CDhttps://github.com/solutions/use-case/ci-cd
View all use caseshttps://github.com/solutions/use-case
Healthcarehttps://github.com/solutions/industry/healthcare
Financial serviceshttps://github.com/solutions/industry/financial-services
Manufacturinghttps://github.com/solutions/industry/manufacturing
Governmenthttps://github.com/solutions/industry/government
View all industrieshttps://github.com/solutions/industry
View all solutionshttps://github.com/solutions
AIhttps://github.com/resources/articles?topic=ai
Software Developmenthttps://github.com/resources/articles?topic=software-development
DevOpshttps://github.com/resources/articles?topic=devops
Securityhttps://github.com/resources/articles?topic=security
View all topicshttps://github.com/resources/articles
Customer storieshttps://github.com/customer-stories
Events & webinarshttps://github.com/resources/events
Ebooks & reportshttps://github.com/resources/whitepapers
Business insightshttps://github.com/solutions/executive-insights
GitHub Skillshttps://skills.github.com
Documentationhttps://docs.github.com
Customer supporthttps://support.github.com
Community forumhttps://github.com/orgs/community/discussions
Trust centerhttps://github.com/trust-center
Partnershttps://github.com/partners
GitHub SponsorsFund open source developershttps://github.com/sponsors
Security Labhttps://securitylab.github.com
Maintainer Communityhttps://maintainers.github.com
Acceleratorhttps://github.com/accelerator
Archive Programhttps://archiveprogram.github.com
Topicshttps://github.com/topics
Trendinghttps://github.com/trending
Collectionshttps://github.com/collections
Enterprise platformAI-powered developer platformhttps://github.com/enterprise
GitHub Advanced SecurityEnterprise-grade security featureshttps://github.com/security/advanced-security
Copilot for BusinessEnterprise-grade AI featureshttps://github.com/features/copilot/copilot-business
Premium SupportEnterprise-grade 24/7 supporthttps://github.com/premium-support
Pricinghttps://github.com/pricing
Search syntax tipshttps://docs.github.com/search-github/github-code-search/understanding-github-code-search-syntax
documentationhttps://docs.github.com/search-github/github-code-search/understanding-github-code-search-syntax
Sign in https://patch-diff.githubusercontent.com/login?return_to=https%3A%2F%2Fgithub.com%2Fwhiteinge%2Fdiffconflicts
Sign up https://patch-diff.githubusercontent.com/signup?ref_cta=Sign+up&ref_loc=header+logged+out&ref_page=%2F%3Cuser-name%3E%2F%3Crepo-name%3E&source=header-repo&source_repo=whiteinge%2Fdiffconflicts
Reloadhttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts
Reloadhttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts
Reloadhttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts
whiteinge https://patch-diff.githubusercontent.com/whiteinge
diffconflictshttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts
Notifications https://patch-diff.githubusercontent.com/login?return_to=%2Fwhiteinge%2Fdiffconflicts
Fork 19 https://patch-diff.githubusercontent.com/login?return_to=%2Fwhiteinge%2Fdiffconflicts
Star 416 https://patch-diff.githubusercontent.com/login?return_to=%2Fwhiteinge%2Fdiffconflicts
BSD-3-Clause license https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/blob/master/LICENSE
416 stars https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/stargazers
19 forks https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/forks
Branches https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/branches
Tags https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/tags
Activity https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/activity
Star https://patch-diff.githubusercontent.com/login?return_to=%2Fwhiteinge%2Fdiffconflicts
Notifications https://patch-diff.githubusercontent.com/login?return_to=%2Fwhiteinge%2Fdiffconflicts
Code https://patch-diff.githubusercontent.com/whiteinge/diffconflicts
Issues 2 https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/issues
Pull requests 0 https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/pulls
Actions https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/actions
Projects 0 https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/projects
Security Uh oh! There was an error while loading. Please reload this page. https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/security
Please reload this pagehttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts
Insights https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/pulse
Code https://patch-diff.githubusercontent.com/whiteinge/diffconflicts
Issues https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/issues
Pull requests https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/pulls
Actions https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/actions
Projects https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/projects
Security https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/security
Insights https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/pulse
Brancheshttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/branches
Tagshttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/tags
https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/branches
https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/tags
55 Commitshttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/commits/master/
https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/commits/master/
_utilshttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/tree/master/_utils
_utilshttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/tree/master/_utils
dochttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/tree/master/doc
dochttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/tree/master/doc
pluginhttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/tree/master/plugin
pluginhttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/tree/master/plugin
.gitignorehttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/blob/master/.gitignore
.gitignorehttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/blob/master/.gitignore
LICENSEhttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/blob/master/LICENSE
LICENSEhttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/blob/master/LICENSE
README.mdhttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/blob/master/README.md
README.mdhttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/blob/master/README.md
READMEhttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts
BSD-3-Clause licensehttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts
https://patch-diff.githubusercontent.com/whiteinge/diffconflicts#vim-diffconflicts
Installationhttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts#installation
https://patch-diff.githubusercontent.com/whiteinge/diffconflicts#why
https://www.youtube.com/watch?v=Pxgl3Wtf78Y
Three-Way Diffs are Hardhttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts#three-way-diffs-are-hard
Editing-Conflict-Markers-is-Hardhttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts#editing-conflict-markers-is-hard
Two-Way Diffs are Eas(ier)https://patch-diff.githubusercontent.com/whiteinge/diffconflicts#two-way-diffs-are-easier
Conflict-Markers are a Two-Way Diffhttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts#conflict-markers-are-a-two-way-diff
https://patch-diff.githubusercontent.com/whiteinge/diffconflicts#three-way-diffs-are-hard
https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/blob/master/_utils/default-vimdiff.png
https://patch-diff.githubusercontent.com/whiteinge/diffconflicts#editing-conflict-markers-is-hard
https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/blob/master/_utils/conflict-markers.png
https://patch-diff.githubusercontent.com/whiteinge/diffconflicts#two-way-diffs-are-easier
https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/blob/master/_utils/vim-diffconflicts.png
https://patch-diff.githubusercontent.com/whiteinge/diffconflicts#conflict-markers-are-a-two-way-diff
https://patch-diff.githubusercontent.com/whiteinge/diffconflicts#installation
https://patch-diff.githubusercontent.com/whiteinge/diffconflicts#mercurial
git https://patch-diff.githubusercontent.com/topics/git
vim https://patch-diff.githubusercontent.com/topics/vim
vim-plugin https://patch-diff.githubusercontent.com/topics/vim-plugin
vimdiff https://patch-diff.githubusercontent.com/topics/vimdiff
mergetool https://patch-diff.githubusercontent.com/topics/mergetool
Readme https://patch-diff.githubusercontent.com/whiteinge/diffconflicts#readme-ov-file
BSD-3-Clause license https://patch-diff.githubusercontent.com/whiteinge/diffconflicts#BSD-3-Clause-1-ov-file
Please reload this pagehttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts
Activityhttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/activity
416 starshttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/stargazers
11 watchinghttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/watchers
19 forkshttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/forks
Report repository https://patch-diff.githubusercontent.com/contact/report-content?content_url=https%3A%2F%2Fgithub.com%2Fwhiteinge%2Fdiffconflicts&report=whiteinge+%28user%29
Releases 7https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/releases
2.3.0 Latest Jan 30, 2024 https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/releases/tag/2.3.0
+ 6 releaseshttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts/releases
Packages 0https://patch-diff.githubusercontent.com/users/whiteinge/packages?repo_name=diffconflicts
Contributors 6https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/graphs/contributors
Please reload this pagehttps://patch-diff.githubusercontent.com/whiteinge/diffconflicts
Vim Script 62.7% https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/search?l=vim-script
Shell 37.3% https://patch-diff.githubusercontent.com/whiteinge/diffconflicts/search?l=shell
https://github.com
Termshttps://docs.github.com/site-policy/github-terms/github-terms-of-service
Privacyhttps://docs.github.com/site-policy/privacy-policies/github-privacy-statement
Securityhttps://github.com/security
Statushttps://www.githubstatus.com/
Communityhttps://github.community/
Docshttps://docs.github.com/
Contacthttps://support.github.com?tags=dotcom-footer

Viewport: width=device-width

URLs of crawlers that visited me.