From 13de93631664cd6eec3afedabb7145d5562a3e01 Mon Sep 17 00:00:00 2001 From: Jacques Germishuys Date: Thu, 12 Mar 2015 12:36:09 +0200 Subject: Collapse whitespace flags into git_merge_file_flags_t --- tests/merge/files.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/merge/files.c') 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); -- cgit v1.2.1