diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-03-10 22:30:41 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:25:05 -0700 |
| commit | 05d47768caf6fec51fa85cb6275c9ba8324aead6 (patch) | |
| tree | bb98a984f248f5139bfdbc9cf41e7174b1139ace /tests/merge/trees/commits.c | |
| parent | f29e48995e1af91127157a1eca4177c2f411b1bb (diff) | |
| download | libgit2-05d47768caf6fec51fa85cb6275c9ba8324aead6.tar.gz | |
Introduce git_merge_file for consumers
Diffstat (limited to 'tests/merge/trees/commits.c')
| -rw-r--r-- | tests/merge/trees/commits.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tests/merge/trees/commits.c b/tests/merge/trees/commits.c index eeb30dae5..08caf804f 100644 --- a/tests/merge/trees/commits.c +++ b/tests/merge/trees/commits.c @@ -8,17 +8,6 @@ static git_repository *repo; #define TEST_REPO_PATH "merge-resolve" -#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" - void test_merge_trees_commits__initialize(void) { repo = cl_git_sandbox_init(TEST_REPO_PATH); |