File indexing completed on 2025-01-05 05:14:47
0001 /* 0002 SPDX-FileCopyrightText: 2021 Hamed Masafi <hamed.masfi@gmail.com> 0003 0004 SPDX-License-Identifier: GPL-3.0-or-later 0005 */ 0006 0007 #pragma once 0008 0009 #include "libkommitdiff_export.h" 0010 #include "segments.h" 0011 #include "types.h" 0012 0013 #include <QList> 0014 0015 namespace Diff 0016 { 0017 struct LIBKOMMITDIFF_EXPORT Diff2Result { 0018 LineEnding oldTextLineEnding; 0019 LineEnding newTextLineEnding; 0020 QList<DiffSegment *> segments; 0021 }; 0022 0023 struct LIBKOMMITDIFF_EXPORT Diff3Result { 0024 LineEnding baseTextLineEnding; 0025 LineEnding localTextLineEnding; 0026 LineEnding remoteTextLineEnding; 0027 QList<MergeSegment *> segments; 0028 }; 0029 };