diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2022-02-02 22:35:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-02 22:35:18 -0500 |
| commit | 61f1e31a146f220a633252ecb1054535f090745b (patch) | |
| tree | 131e3dc33529701fa1d62103f9c78a5f374f45f4 /tests | |
| parent | 18a477e7557b35987c33e0ada88702decac4b457 (diff) | |
| parent | c0297d47c77139efc22dbba169023e3f53315be5 (diff) | |
| download | libgit2-61f1e31a146f220a633252ecb1054535f090745b.tar.gz | |
Merge pull request #6197 from libgit2/ethomson/merge_msg_conflict_comment
merge: comment conflicts lines in MERGE_MSG
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cherrypick/workdir.c | 14 | ||||
| -rw-r--r-- | tests/merge/workdir/simple.c | 4 | ||||
| -rw-r--r-- | tests/revert/workdir.c | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/tests/cherrypick/workdir.c b/tests/cherrypick/workdir.c index 868b9d5ff..8fd1ecbdf 100644 --- a/tests/cherrypick/workdir.c +++ b/tests/cherrypick/workdir.c @@ -170,9 +170,9 @@ void test_cherrypick_workdir__conflicts(void) cl_assert(strcmp(git_str_cstr(&mergemsg_buf), "Change all files\n" \ "\n" \ - "Conflicts:\n" \ - "\tfile2.txt\n" \ - "\tfile3.txt\n") == 0); + "#Conflicts:\n" \ + "#\tfile2.txt\n" \ + "#\tfile3.txt\n") == 0); cl_git_pass(git_futils_readbuffer(&conflicting_buf, TEST_REPO_PATH "/file2.txt")); @@ -352,10 +352,10 @@ void test_cherrypick_workdir__both_renamed(void) cl_assert(strcmp(git_str_cstr(&mergemsg_buf), "Renamed file3.txt -> file3.txt.renamed\n" \ "\n" \ - "Conflicts:\n" \ - "\tfile3.txt\n" \ - "\tfile3.txt.renamed\n" \ - "\tfile3.txt.renamed_on_branch\n") == 0); + "#Conflicts:\n" \ + "#\tfile3.txt\n" \ + "#\tfile3.txt.renamed\n" \ + "#\tfile3.txt.renamed_on_branch\n") == 0); git_str_dispose(&mergemsg_buf); git_commit_free(commit); diff --git a/tests/merge/workdir/simple.c b/tests/merge/workdir/simple.c index 0b672d6a0..b9d3fc24c 100644 --- a/tests/merge/workdir/simple.c +++ b/tests/merge/workdir/simple.c @@ -278,8 +278,8 @@ void test_merge_workdir_simple__mergefile(void) cl_assert(strcmp(git_str_cstr(&mergemsg_buf), "Merge commit '7cb63eed597130ba4abb87b3e544b85021905520'\n" \ "\n" \ - "Conflicts:\n" \ - "\tconflicting.txt\n") == 0); + "#Conflicts:\n" \ + "#\tconflicting.txt\n") == 0); git_str_dispose(&conflicting_buf); git_str_dispose(&mergemsg_buf); diff --git a/tests/revert/workdir.c b/tests/revert/workdir.c index 0c9810814..3f54280ca 100644 --- a/tests/revert/workdir.c +++ b/tests/revert/workdir.c @@ -119,8 +119,8 @@ void test_revert_workdir__conflicts(void) "\n" \ "This reverts commit 72333f47d4e83616630ff3b0ffe4c0faebcc3c45.\n" "\n" \ - "Conflicts:\n" \ - "\tfile1.txt\n") == 0); + "#Conflicts:\n" \ + "#\tfile1.txt\n") == 0); git_commit_free(commit); git_commit_free(head); |