diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-03-10 22:30:41 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-16 18:02:12 -0700 |
| commit | 8c062d51af841c11cc95ebb34d95ee4d71621d09 (patch) | |
| tree | 82e0a8b3613a0167329927a513bbd2bd67adfa1d /tests/merge/merge_helpers.h | |
| parent | 2b40390f226ac8ba516fdf0d893e0b5a29857dc7 (diff) | |
| download | libgit2-ed/merge_file.tar.gz | |
Introduce git_merge_file for consumersed/merge_file
Diffstat (limited to 'tests/merge/merge_helpers.h')
| -rw-r--r-- | tests/merge/merge_helpers.h | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/tests/merge/merge_helpers.h b/tests/merge/merge_helpers.h index 3f53abc7c..63d1cb7a9 100644 --- a/tests/merge/merge_helpers.h +++ b/tests/merge/merge_helpers.h @@ -4,6 +4,49 @@ #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[41]; |