New upstream version 1.1.0+dfsg.1

[libgit2.git] / tests / merge / merge_helpers.h

diff --git a/tests/merge/merge_helpers.h b/tests/merge/merge_helpers.h
index 554c24b7cd144e305f90def65a0c53914be77711..166b4eefddb68d66f277bb091b7cb4519a29ca18 100644 (file)
--- a/tests/merge/merge_helpers.h
+++ b/tests/merge/merge_helpers.h
@@ -4,49 +4,6 @@
 #include "merge.h"
 #include "git2/merge.h"
 
-#define AUTOMERGEABLE_MERGED_FILE \
-       "this file is changed in master\n" \
-       "this file is automergeable\n" \
-       "this file is automergeable\n" \
-       "this file is automergeable\n" \
-       "this file is automergeable\n" \
-       "this file is automergeable\n" \
-       "this file is automergeable\n" \
-       "this file is automergeable\n" \
-       "this file is changed in branch\n"
-
-#define AUTOMERGEABLE_MERGED_FILE_CRLF \
-       "this file is changed in master\r\n" \
-       "this file is automergeable\r\n" \
-       "this file is automergeable\r\n" \
-       "this file is automergeable\r\n" \
-       "this file is automergeable\r\n" \
-       "this file is automergeable\r\n" \
-       "this file is automergeable\r\n" \
-       "this file is automergeable\r\n" \
-       "this file is changed in branch\r\n"
-
-#define CONFLICTING_MERGE_FILE \
-       "<<<<<<< HEAD\n" \
-       "this file is changed in master and branch\n" \
-       "=======\n" \
-       "this file is changed in branch and master\n" \
-       ">>>>>>> 7cb63eed597130ba4abb87b3e544b85021905520\n"
-
-#define CONFLICTING_DIFF3_FILE \
-       "<<<<<<< HEAD\n" \
-       "this file is changed in master and branch\n" \
-       "||||||| initial\n" \
-       "this file is a conflict\n" \
-       "=======\n" \
-       "this file is changed in branch and master\n" \
-       ">>>>>>> 7cb63eed597130ba4abb87b3e544b85021905520\n"
-
-#define CONFLICTING_UNION_FILE \
-       "this file is changed in master and branch\n" \
-       "this file is changed in branch and master\n"
-
-
 struct merge_index_entry {
        uint16_t mode;
        char oid_str[GIT_OID_HEXSZ+1];
@@ -79,7 +36,7 @@ struct merge_index_conflict_data {
        struct merge_index_with_status ancestor;
        struct merge_index_with_status ours;
        struct merge_index_with_status theirs;
-       git_merge_diff_type_t change_type;
+       git_merge_diff_t change_type;
 };
 
 int merge_trees_from_branches(