next »

[sonder]

Is there a tool out there that can let me quickly review differences line-by-line between files in 2 directory trees and choose a direction, i.e. copy file A's line to File B's line and vice versa?

It's 2 Mercurial repos, so actually I think it's be better to be able to copy bits of commit history between them.  Is there a way to do that?

[TheLastBanana]

Meld is a pretty good diff and merge tool which includes an option to compare two directories:

http://meldmerge.org/

[sonder]

Meld is a pretty good diff and merge tool which includes an option to compare two directories:

http://meldmerge.org/

Thanks, this worked perfectly.