(List (= scope= flags=0 words=[] bindings=[('test_description', {[SQ ]})]) (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]} ) (= scope= flags=0 words=[] bindings=[('GIT_COMMITTER_DATE', {[DQ [LIT_CHARS "2006-12-12 23:28:00 +0100"]]})]) (= scope= flags=1 words=[{[LIT_CHARS GIT_COMMITTER_DATE]}] bindings=[]) (Com {[LIT_CHARS test_expect_success]} {[DQ [LIT_CHARS "setup tests"]]} {[SQ a1 &&\n"> a1 &&\n"> a1 &&\n"> .git/MERGE_HEAD &&\n"> a1 &&\n"> a1 &&\n"> a1 &&\n"> .git/MERGE_HEAD &&\n"> a1 &&\n"> .git/MERGE_HEAD &&\n"> a1 &&\n"> .git/MERGE_HEAD &&\n"> a1 &&\n"> ]} ) (Com {[LIT_CHARS test_expect_success]} {[DQ [LIT_CHARS "combined merge conflicts"]]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "\ttest_must_fail git merge -m final G\n"]]} ) (Com {[LIT_CHARS cat]} < (FilenameRedirectNode filename={[LIT_CHARS expect]} "> 1), (HereDocRedirectNode here_end='EOF' do_expansion=True body_word={[DQ [LIT_CHARS "<<<<<<< HEAD\n"][LIT_CHARS "F\n"][LIT_CHARS "=======\n"][LIT_CHARS "G\n"][LIT_CHARS ">>>>>>> G\n"]]} 0), > ) (Com {[LIT_CHARS test_expect_success]} {[DQ [LIT_CHARS "result contains a conflict"]]} {[DQ [LIT_CHARS "test_cmp expect a1"]]} ) (Com {[LIT_CHARS git]} {[LIT_CHARS ls-files]} {[LIT_CHARS --stage]} < (FilenameRedirectNode filename={[LIT_CHARS out]} "> 1), > ) (Com {[LIT_CHARS cat]} < (FilenameRedirectNode filename={[LIT_CHARS expect]} "> 1), (HereDocRedirectNode here_end='EOF' do_expansion=True body_word={[DQ [LIT_CHARS "100644 439cc46de773d8a83c77799b7cc9191c128bfcff 1\ta1\n"][LIT_CHARS "100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2\ta1\n"][LIT_CHARS "100644 fd7923529855d0b274795ae3349c5e0438333979 3\ta1\n"]]} 0), > ) (Com {[LIT_CHARS test_expect_success]} {[DQ [LIT_CHARS "virtual trees were processed"]]} {[DQ [LIT_CHARS "test_cmp expect out"]]} ) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ binary-file &&\n"> binary-file &&\n"> merge.out 2> merge.err &&\n"> ]} ) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]} ) (Com {[LIT_CHARS test_done]} ) )