diff options
| author | Jacques Germishuys <jacquesg@striata.com> | 2015-03-12 12:36:09 +0200 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2015-03-16 09:53:27 +0200 |
| commit | 13de93631664cd6eec3afedabb7145d5562a3e01 (patch) | |
| tree | af7eadb3ace1e871f458156bf7524b0c4fcf1f6a /tests/merge/files.c | |
| parent | f29dde682866c293292ce405fcfef1511ced3f55 (diff) | |
| download | libgit2-13de93631664cd6eec3afedabb7145d5562a3e01.tar.gz | |
Collapse whitespace flags into git_merge_file_flags_t
Diffstat (limited to 'tests/merge/files.c')
| -rw-r--r-- | tests/merge/files.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/merge/files.c b/tests/merge/files.c index cb9e8d195..7f461abff 100644 --- a/tests/merge/files.c +++ b/tests/merge/files.c @@ -198,7 +198,7 @@ void test_merge_files__automerge_whitespace_eol(void) theirs.path = "testfile.txt"; theirs.mode = 0100755; - opts.whitespace_flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL; + opts.flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL; cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, &opts)); cl_assert_equal_i(1, result.automergeable); @@ -236,7 +236,7 @@ void test_merge_files__automerge_whitespace_change(void) theirs.path = "testfile.txt"; theirs.mode = 0100755; - opts.whitespace_flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE; + opts.flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE; cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, &opts)); cl_assert_equal_i(1, result.automergeable); |