(List (Com {[LIT_OTHER ":"]} {[LIT_CHARS Included]} {[LIT_CHARS from]} {[LIT_CHARS t1000-read-tree-m-3way.sh]} {[LIT_CHARS and]} {[LIT_CHARS others]}) (Com {[LIT_CHARS mkdir]} {[LIT_CHARS Z]}) (For a [{[LIT_CHARS N]}, {[LIT_CHARS D]}, {[LIT_CHARS M]}]) (For b [{[LIT_CHARS N]}, {[LIT_CHARS D]}, {[LIT_CHARS M]}]) (List (= scope= flags=0 words=[] bindings=[('p', {[VarSub a] [VarSub b]})]) (Com {[LIT_CHARS echo]} {[LIT_CHARS This]} {[LIT_CHARS is]} {[VarSub p]} {[LIT_CHARS from]} {[LIT_CHARS the]} {[LIT_CHARS original]} {[LIT_CHARS tree.]} < (FilenameRedirectNode filename={[VarSub p]} "> 1), > ) (Com {[LIT_CHARS echo]} {[LIT_CHARS This]} {[LIT_CHARS is]} {[LIT_CHARS Z/] [VarSub p]} {[LIT_CHARS from]} {[LIT_CHARS the]} {[LIT_CHARS original]} {[LIT_CHARS tree.]} < (FilenameRedirectNode filename={[LIT_CHARS Z/] [VarSub p]} "> 1), > ) (Com {[LIT_CHARS test_expect_success]} {[DQ [LIT_CHARS "adding test file "][VarSub p][LIT_CHARS " and Z/"][VarSub p]]} {[SQ ]}) ) ) ) (Com {[LIT_CHARS echo]} {[LIT_CHARS This]} {[LIT_CHARS is]} {[LIT_CHARS SS]} {[LIT_CHARS from]} {[LIT_CHARS the]} {[LIT_CHARS original]} {[LIT_CHARS tree.]} < (FilenameRedirectNode filename={[LIT_CHARS SS]} "> 1), > ) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (Com {[LIT_CHARS cat]} < (FilenameRedirectNode filename={[LIT_CHARS TT]} "> 1), (HereDocRedirectNode here_end='EOF' do_expansion=False body_word={[LIT_CHARS "This is a trivial merge sample text.\n"] [LIT_CHARS "Branch A is expected to upcase this word, here.\n"] [LIT_CHARS "There are some filler lines to avoid diff context\n"] [LIT_CHARS "conflicts here,\n"] [LIT_CHARS "like this one,\n"] [LIT_CHARS "and this one,\n"] [LIT_CHARS "and this one is yet another one of them.\n"] [LIT_CHARS "At the very end, here comes another line, that is\n"] [LIT_CHARS "the word, expected to be upcased by Branch B.\n"] [LIT_CHARS "This concludes the trivial merge sample file.\n"]} 0), > ) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (= scope= flags=0 words=[] bindings=[('to_remove', {[ComSub (Com {[LIT_CHARS echo]} {[LIT_CHARS D] [LIT_OTHER "?"]} {[LIT_CHARS Z/D] [LIT_OTHER "?"]})]})]) (Com {[LIT_CHARS rm]} {[LIT_CHARS -f]} {[VarSub to_remove]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (For p [{[LIT_CHARS M] [LIT_OTHER "?"]}, {[LIT_CHARS Z/M] [LIT_OTHER "?"]}]) (List (Com {[LIT_CHARS echo]} {[LIT_CHARS This]} {[LIT_CHARS is]} {[LIT_CHARS modified]} {[VarSub p]} {[LIT_CHARS in]} {[LIT_CHARS the]} {[LIT_CHARS branch]} {[LIT_CHARS A.]} < (FilenameRedirectNode filename={[VarSub p]} "> 1), > ) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[DQ [LIT_CHARS "git update-index "][VarSub p]]}) ) ) (For p [{[LIT_CHARS AN]}, {[LIT_CHARS AA]}, {[LIT_CHARS Z/AN]}, {[LIT_CHARS Z/AA]}]) (List (Com {[LIT_CHARS echo]} {[LIT_CHARS This]} {[LIT_CHARS is]} {[LIT_CHARS added]} {[VarSub p]} {[LIT_CHARS in]} {[LIT_CHARS the]} {[LIT_CHARS branch]} {[LIT_CHARS A.]} < (FilenameRedirectNode filename={[VarSub p]} "> 1), > ) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[DQ [LIT_CHARS "git update-index --add "][VarSub p]]}) ) ) (Com {[LIT_CHARS echo]} {[LIT_CHARS This]} {[LIT_CHARS is]} {[LIT_CHARS SS]} {[LIT_CHARS from]} {[LIT_CHARS the]} {[LIT_CHARS modified]} {[LIT_CHARS tree.]} < (FilenameRedirectNode filename={[LIT_CHARS SS]} "> 1), > ) (Com {[LIT_CHARS echo]} {[LIT_CHARS This]} {[LIT_CHARS is]} {[LIT_CHARS LL]} {[LIT_CHARS from]} {[LIT_CHARS the]} {[LIT_CHARS modified]} {[LIT_CHARS tree.]} < (FilenameRedirectNode filename={[LIT_CHARS LL]} "> 1), > ) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (Com {[LIT_CHARS mv]} {[LIT_CHARS TT]} {[LIT_CHARS TT-]}) (Com {[LIT_CHARS sed]} {[LIT_CHARS -e]} {[SQ ]} < (FilenameRedirectNode filename={[LIT_CHARS TT-]} 0), (FilenameRedirectNode filename={[LIT_CHARS TT]} "> 1), > ) (Com {[LIT_CHARS rm]} {[LIT_CHARS -f]} {[LIT_CHARS TT-]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (Com {[LIT_CHARS mkdir]} {[LIT_CHARS DF]}) (Com {[LIT_CHARS echo]} {[LIT_CHARS Branch]} {[LIT_CHARS A]} {[LIT_CHARS makes]} {[LIT_CHARS a]} {[LIT_CHARS file]} {[LIT_CHARS at]} {[LIT_CHARS DF/DF] [LIT_COMMA ","]} {[LIT_CHARS creating]} {[LIT_CHARS a]} {[LIT_CHARS directory]} {[LIT_CHARS DF.]} < (FilenameRedirectNode filename={[LIT_CHARS DF/DF]} "> 1), > ) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (Com {[LIT_CHARS rm]} {[LIT_CHARS -rf]} {[LIT_OTHER "["] [LIT_CHARS NDMASLT] [LIT_OTHER "]"] [LIT_OTHER "["] [LIT_CHARS NDMASLT] [LIT_OTHER "]"]} {[LIT_CHARS Z]} {[LIT_CHARS DF]}) (Com {[LIT_CHARS mkdir]} {[LIT_CHARS Z]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (= scope= flags=0 words=[] bindings=[('to_remove', {[ComSub (Com {[LIT_CHARS echo]} {[LIT_OTHER "?"] [LIT_CHARS D]} {[LIT_CHARS Z/] [LIT_OTHER "?"] [LIT_CHARS D]})]})]) (Com {[LIT_CHARS rm]} {[LIT_CHARS -f]} {[VarSub to_remove]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[DQ [LIT_CHARS "git update-index --remove "][VarSub to_remove]]}) (For p [{[LIT_OTHER "?"] [LIT_CHARS M]}, {[LIT_CHARS Z/] [LIT_OTHER "?"] [LIT_CHARS M]}]) (List (Com {[LIT_CHARS echo]} {[LIT_CHARS This]} {[LIT_CHARS is]} {[LIT_CHARS modified]} {[VarSub p]} {[LIT_CHARS in]} {[LIT_CHARS the]} {[LIT_CHARS branch]} {[LIT_CHARS B.]} < (FilenameRedirectNode filename={[VarSub p]} "> 1), > ) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[DQ [LIT_CHARS "git update-index "][VarSub p]]}) ) ) (For p [{[LIT_CHARS NA]}, {[LIT_CHARS AA]}, {[LIT_CHARS Z/NA]}, {[LIT_CHARS Z/AA]}]) (List (Com {[LIT_CHARS echo]} {[LIT_CHARS This]} {[LIT_CHARS is]} {[LIT_CHARS added]} {[VarSub p]} {[LIT_CHARS in]} {[LIT_CHARS the]} {[LIT_CHARS branch]} {[LIT_CHARS B.]} < (FilenameRedirectNode filename={[VarSub p]} "> 1), > ) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[DQ [LIT_CHARS "git update-index --add "][VarSub p]]}) ) ) (Com {[LIT_CHARS echo]} {[LIT_CHARS This]} {[LIT_CHARS is]} {[LIT_CHARS SS]} {[LIT_CHARS from]} {[LIT_CHARS the]} {[LIT_CHARS modified]} {[LIT_CHARS tree.]} < (FilenameRedirectNode filename={[LIT_CHARS SS]} "> 1), > ) (Com {[LIT_CHARS echo]} {[LIT_CHARS This]} {[LIT_CHARS is]} {[LIT_CHARS LL]} {[LIT_CHARS from]} {[LIT_CHARS the]} {[LIT_CHARS modified]} {[LIT_CHARS tree.]} < (FilenameRedirectNode filename={[LIT_CHARS LL]} "> 1), > ) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (Com {[LIT_CHARS mv]} {[LIT_CHARS TT]} {[LIT_CHARS TT-]}) (Com {[LIT_CHARS sed]} {[LIT_CHARS -e]} {[SQ ]} < (FilenameRedirectNode filename={[LIT_CHARS TT-]} 0), (FilenameRedirectNode filename={[LIT_CHARS TT]} "> 1), > ) (Com {[LIT_CHARS rm]} {[LIT_CHARS -f]} {[LIT_CHARS TT-]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (Com {[LIT_CHARS echo]} {[LIT_CHARS Branch]} {[LIT_CHARS B]} {[LIT_CHARS makes]} {[LIT_CHARS a]} {[LIT_CHARS file]} {[LIT_CHARS at]} {[LIT_CHARS DF.]} < (FilenameRedirectNode filename={[LIT_CHARS DF]} "> 1), > ) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) )