meld
Meld: can I clear the read-only flag on file?
Use meld as git diff tool without a wrapper script
What are “synchronzation points”?
Related Links
Meld: can I clear the read-only flag on file?
Use meld as git diff tool without a wrapper script
What are “synchronzation points”?
Does 'meld' have a command-line style?
Installing meld on OS X