diff options
Diffstat (limited to 'tests/merge/conflict_data.h')
| -rw-r--r-- | tests/merge/conflict_data.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/merge/conflict_data.h b/tests/merge/conflict_data.h index 27f19c1b0..0b1e7ee03 100644 --- 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" |