search

holman / ama

Ask @holman anything!
732 stars 278 forks source link

What's your favorite diff/merge tool? #732

Closed sharat closed 8 years ago

sharat commented 8 years ago

Which tool you use for diff/merge with git?

holman commented 8 years ago

I just use the command line diff and merge stuff. If it's a complicate merge I'll use OS X's FileMerge, but otherwise, nothing special.