-
Michael Reeves authored
Conflicts: CMakeLists.txt src/CMakeLists.txt src/common.cpp src/difftextwindow.cpp src/directorymergewindow.cpp src/main.cpp src/mergeresultwindow.cpp src/optiondialog.cpp
67e61da3
Conflicts: CMakeLists.txt src/CMakeLists.txt src/common.cpp src/difftextwindow.cpp src/directorymergewindow.cpp src/main.cpp src/mergeresultwindow.cpp src/optiondialog.cpp