A free diff/merge tool for Mac, Windows and Linux to visually compare and merge files. No frills, but does the job well.
Other similar tools
A full featured git client and code editor for iPhone and iPad. Source combines a powerful code editor with syntax highlighting for over 100 languages with a git client so you can commit, pull, push, branch, and more, with specific integrations for GitHub, Bitbucket and Gitlab. It also includes a built in coding keyboard inspired by Swift Playgrounds with common programming characters that can be used across iOS as a 3rd party keyboard. […]
A tool that runs during your CI process and gives teams the chance to automate common code review chores. Danger can help lint your tasks in daily code review by leaving messages in your pull requests based on rules that you create with the Ruby. As rules are adhered to, the message is amended to reflect the current state of the code review. It runs a Dangerfile that you set up per-project with a collection of project specific rules. Danger currently supports Circle, Travis, Jenkins, Buildkite, Semaphore, TeamCity, Xcode Bots, Drone, and Surf and can easily be integrated with fastlane. […]
A Git client generating pretty diffs built right into Sketch. Git Sketch Plugin lets you follow a typical Git flow – after working normally on your designs, you can create a branch, commit the changes, push your changes to a remote and create a pull request to merge into master, all from a convenient menu right in Sketch. The plugin creates PNGs of each artboard in your Sketch file so you can easily view visual pretty diffs in your Git client of choice or GitHub, as you make changes. […]
An iOS app for managing issues for your GitHub, GitLab or Bitbucket projects on iPhone and iPad. Branches offers a convenient way for you to navigate open or closed issues, create your own issue list filters, see all commits on all branches and view detailed pull requests including comments, commits and file diffs for free. You can also upgrade the app with in app purchase to unlock creating and editing issues and comments, assigning issues to collaborators, closing and reopening issues and more. […]