New upstream version 1.4.3+dfsg.1

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

diff --git a/tests/merge/conflict_data.h b/tests/merge/conflict_data.h
index 27f19c1b01b1c281fee998e2b3048549b525dc7c..0b1e7ee032ee5b9315b97d89edb766d8e7696957 100644 (file)
--- a/tests/merge/conflict_data.h
+++ b/tests/merge/conflict_data.h
@@ -36,6 +36,15 @@
        "this file is changed in branch and master\n" \
        ">>>>>>> 7cb63eed597130ba4abb87b3e544b85021905520\n"
 
+#define CONFLICTING_ZDIFF3_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"