mirror of
https://github.com/textmate/textmate.git
synced 2026-02-15 00:45:02 -05:00
7 lines
240 B
C++
7 lines
240 B
C++
#ifndef MERGE_H_G9U6AOAI
|
|
#define MERGE_H_G9U6AOAI
|
|
|
|
std::string merge (std::string const& oldContent, std::string const& myContent, std::string const& yourContent, bool* conflict = NULL);
|
|
|
|
#endif /* end of include guard: MERGE_H_G9U6AOAI */
|