TortoiseMergeTortoiseSVN
|
||||||
Related Products
|
||||||
About
Gitoryx is a fast, native Git GUI client for macOS and Windows. Built without Electron, it offers a lightweight (~12 MB) and responsive experience.
Features include:
- Visual commit graph with color-coded lanes and infinite scroll
- Interactive rebase with drag-and-drop reordering, squash, and fixup
- Smart staging: stage files, hunks, or individual lines
- Merge conflict resolution with three-way side-by-side diff
- Branch management with folder-grouped tree view
- GitFlow, auto-generated changelog, and sprint board
- In-app pull request management (GitHub, GitLab, Bitbucket, Azure DevOps)
- Git Bisect UI for visual regression hunting
- Gitmoji integration and command palette (⌘K)
- 1-click undo/redo for all major actions
- Light/dark mode, colorblind-safe palette
|
About
Version control is all about having the history of your working progress. But to really see and check the history, you must be able to see and check what has changed between two points in time, for example, what has changed between two releases of your product, or what was changed to fix a bug, etc. This is where TortoiseMerge helps. It is a diff/merge software tool for Windows with a tight integration for TortoiseSVN. At least for files that consist of text, TortoiseMerge can help you here. It shows you the two versions of a file side-by-side, coloring every modified line in that file. When you reformat your code or text, sometimes you don't really change anything but only split a long line into multiple ones, or you merge multiple lines into one. TortoiseMerge marks such changes with a white circle on the left gray bar of each view. If you see such a white circle, you know that no real changes were made, only changes in whitespaces.
|
|||||
Platforms Supported
Windows
Mac
Linux
Cloud
On-Premises
iPhone
iPad
Android
Chromebook
|
Platforms Supported
Windows
Mac
Linux
Cloud
On-Premises
iPhone
iPad
Android
Chromebook
|
|||||
Audience
Software developers on macOS and Windows
|
Audience
Developers and any user looking for a diff and merge software tool to compare between files and directories
|
|||||
Support
Phone Support
24/7 Live Support
Online
|
Support
Phone Support
24/7 Live Support
Online
|
|||||
API
Offers API
|
API
Offers API
|
|||||
Screenshots and Videos |
Screenshots and Videos |
|||||
Pricing
Free
Free Version
Free Trial
|
Pricing
No information available.
Free Version
Free Trial
|
|||||
Reviews/
|
Reviews/
|
|||||
Training
Documentation
Webinars
Live Online
In Person
|
Training
Documentation
Webinars
Live Online
In Person
|
|||||
Company InformationGitoryx
Founded: 2026
France
www.gitoryx.com
|
Company InformationTortoiseSVN
Founded: 2004
tortoisesvn.net/TortoiseMerge.html
|
|||||
Alternatives |
Alternatives |
|||||
|
|
||||||
|
|
|
|||||
Categories |
Categories |
|||||
|
|
|