![]() ![]() Then the Compare Revisions dialog appears, showing a list of changed files (maybe with a folder filter pre-applied). Then select Compare revisions from the context menu (cf. If you want to see the difference between two revisions which are already committed, use the Log dialog and select the two revisions you want to compare (using the usual Ctrl-modifier). Difference between two previous revisions It will not show changes newer than your working tree. This shows you the last change made to that file to bring it to the state you now see in your working tree. This will perform a diff between the revision before the last-commit-date (as recorded in your working tree) and the working BASE. Then select TortoiseGit → Diff with previous version. If you want to see the difference between the last committed revision and your working tree, assuming that the working tree hasn't been modified, just right click on the file. If you want to see the difference between a particular revision and your working tree, use the Log dialog, select the revision of interest, then select Compare with working tree from the context menu (cf. That about wraps up that thread's merge into this one, as covered here.If you want to see what (uncommitted) changes you have made in your working tree, just use the explorer context menu and select TortoiseGit → Diff. I had to use Vim because most of diffs mentioned here do not understand UTF-8. ![]() P4Merge that comes with Perforce is pretty good and comes for free with perforce client.Eclipse also has a fairly decent comparison mechanism.It (Beyond Compare) runs well in Wine, but I miss the shell integration.There were some other suggestions, which were not diff tools in their own right, which I will list below: Bare Bones Software's TextWrangler, free. ![]() Note that any links to SO will only be visible to users who can view deleted content, which requires either moderator privileges or 10k reputation on that site. It includes links to each product, and the current price since last edit in USD. This is an aggregation of the answers posted on SO's deleted clone, Graphical diff for Mac OS X. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |