log kdiff3/src-QT4/mergeresultwindow.cpp @ 113:7bca1f1340f6 tip

age author description
Mon, 17 Dec 2018 11:13:01 +0000 Chris Cannam Build fixes for Xcode 10 / Qt 5.12 default tip
Sun, 28 Nov 2010 16:44:56 +0000 joachim99 Separate deltas if only one is of type where B==C