diffmerge und forklift https://sourcegear.com/diffmerge/ [sourcegear.com] http://www.binarynights.com/forklift/ [binarynights.com]