News for hackers. Stuff that matters.
Re:Diff tools on Mac OS X - an overview by mcmillion on Thursday December 05, 2013 @01:45PM (#6856249)
You can edit the merged file in place while merging.

There are no comments on this comment yet.