1 // SPDX-License-Identifier: GPL-2.0-or-later
3 * @file ConflictFileParser.h
5 * @brief Declaration ConflictFileParser.
7 // Conflict file parsing method modified from original code got from:
8 // TortoiseCVS - a Windows shell extension for easy version control
9 // Copyright (C) 2000 - Francis Irving
10 // <francis@flourish.org> - January 2001
14 #include "UnicodeString.h"
16 namespace ConflictFileParser
18 bool IsConflictFile(const String& conflictFileName);
20 bool ParseConflictFile(const String& conflictFileName,
21 const String& workingCopyFileName, const String& newRevisionFileName, const String& baseRevisionFileName,
22 int iGuessEncodingType, bool &nestedConflicts, bool &b3way);