https://github.com/kiprasmel/git-diff3c
diff 3-way conflicts — solve merge conflicts fast
https://github.com/kiprasmel/git-diff3c
conflict-resolution git
Last synced: about 1 year ago
JSON representation
diff 3-way conflicts — solve merge conflicts fast
- Host: GitHub
- URL: https://github.com/kiprasmel/git-diff3c
- Owner: kiprasmel
- Created: 2022-08-22T15:22:49.000Z (almost 4 years ago)
- Default Branch: master
- Last Pushed: 2025-01-22T10:11:21.000Z (over 1 year ago)
- Last Synced: 2025-03-26T16:38:50.911Z (about 1 year ago)
- Topics: conflict-resolution, git
- Language: JavaScript
- Homepage:
- Size: 16.6 KB
- Stars: 4
- Watchers: 1
- Forks: 0
- Open Issues: 0