When files are transferred across time zones and between Microsoft FAT and NTFS file systems, the timestamp displayed by the same file may change, so that identical files with different storage histories are deemed different by a comparer that requires the timestamps to match.The difference is an exact number of quarters of an hour up to 95 (same minutes modulo 15 and seconds. Both options can be selected as a Diff/Merge Tool in SourceTree. You can also try the P4 Merge tool from Perforce which is offered for free.

You can try WinMerge for Windows, I've used it in the past and it's pretty nice, and open source. In Mac, when you install Xcode you get a diff tool named FileMerge, simple but sufficient in most of the cases. It features visual differencing and merging of text files, a flexible editor with syntax highlighting, line numbers and word-wrap and handles DOS, UNIX and MAC text. It is highly useful for determing what has changed between project versions, and then merging changes between versions.

WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. This article compares computer software tools that compare files, and in many cases directories or folders, whether it is their main purpose or as part of more general file management.

Winmerge mac os x