Lines Matching refs:GIT_MERGE_MSG_FILE

92 	cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branch '" OCTO1_BRANCH "'\n"));  in test_merge_workdir_setup__one_branch()
118 cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge commit '" OCTO1_OID "'\n")); in test_merge_workdir_setup__one_oid()
146 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "' and '" OCTO2_B… in test_merge_workdir_setup__two_branches()
182 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "', '" OCTO2_BRAN… in test_merge_workdir_setup__three_branches()
220 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge commit '" OCTO1_OID "'; commit '" OCTO2_OI… in test_merge_workdir_setup__three_oids()
250 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branch '" OCTO1_BRANCH "'; commit '" OCTO2… in test_merge_workdir_setup__branches_and_oids_1()
289 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "' and '" OCTO3_B… in test_merge_workdir_setup__branches_and_oids_2()
331 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge commit '" OCTO1_OID "'; branches '" OCTO2_… in test_merge_workdir_setup__branches_and_oids_3()
377 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge commit '" OCTO1_OID "'; branches '" OCTO2_… in test_merge_workdir_setup__branches_and_oids_4()
417 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "', '" OCTO1_BRAN… in test_merge_workdir_setup__three_same_branches()
455 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge commit '" OCTO1_OID "'; commit '" OCTO1_OI… in test_merge_workdir_setup__three_same_oids()
526 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge remote-tracking branch 'refs/remotes/origi… in test_merge_workdir_setup__remote_tracking_one_branch()
559 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge remote-tracking branches 'refs/remotes/ori… in test_merge_workdir_setup__remote_tracking_two_branches()
599 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge remote-tracking branches 'refs/remotes/ori… in test_merge_workdir_setup__remote_tracking_three_branches()
635 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branch '" OCTO1_BRANCH "', remote-tracking… in test_merge_workdir_setup__normal_branch_and_remote_tracking_branch()
669 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branch '" OCTO2_BRANCH "', remote-tracking… in test_merge_workdir_setup__remote_tracking_branch_and_normal_branch()
712 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "' and '" OCTO3_B… in test_merge_workdir_setup__two_remote_tracking_branch_and_two_normal_branches()
744 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branch 'octo1' of http://remote.url/repo.g… in test_merge_workdir_setup__pull_one()
772 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "' and '" OCTO2_B… in test_merge_workdir_setup__pull_two()
805 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "', '" OCTO2_BRAN… in test_merge_workdir_setup__pull_three()
838 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branch '" OCTO1_BRANCH "' of http://remote… in test_merge_workdir_setup__three_remotes()
875 …cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "' and '" OCTO3_B… in test_merge_workdir_setup__two_remotes()
1013 cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branch '" OCTO1_BRANCH "'\n")); in test_merge_workdir_setup__retained_after_success()
1041 cl_assert(!git_path_exists("merge-resolve/.git/" GIT_MERGE_MSG_FILE)); in test_merge_workdir_setup__removed_after_failure()