(List (= scope= flags=0 words=[] bindings=[('test_description', {[SQ ]})]) (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]}) (Com {[LIT_CHARS .]} {[DQ [VarSub TEST_DIRECTORY]] [LIT_CHARS /lib-read-tree.sh]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ file1 file one &&\n"> file2 file two &&\n"> subdir/file1 file one in subdirectory &&\n"> subdir/file2 file two in subdirectory &&\n"> ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ file2 master creates untracked file2 &&\n"> subdir/file2 master creates untracked subdir/file2 &&\n"> &1)\n"> ]}) (Com {[LIT_CHARS echo]} {[LIT_CHARS file2]} < (FilenameRedirectNode filename={[LIT_CHARS .gitignore]} "> 1), > ) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ &1)\n"> ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ &1)\n"> ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (Com {[LIT_CHARS rm]} {[LIT_CHARS -f]} {[LIT_CHARS .gitignore]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ file3 file three &&\n"> subdir/file3 file three &&\n"> file2 file two is untracked on the master side &&\n"> subdir/file2 file two is untracked on the master side &&\n"> ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ file3 file three created in master, untracked &&\n"> subdir/file3 file three created in master, untracked &&\n"> &1)\n"> ]}) (Com {[LIT_CHARS echo]} {[LIT_CHARS file3]} < (FilenameRedirectNode filename={[LIT_CHARS .gitignore]} "> 1), > ) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ file3 file three created in master, untracked &&\n"> subdir/file3 file three created in master, untracked &&\n"> ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ >file1 \"new line to be kept in the merge result\" &&\n"> >file2 \"new line to be kept in the merge result\" &&\n"> ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ >file1 \"local changes\" &&\n"> ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ >file2 \"local changes\" &&\n"> ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ a/b &&\n"> ]}) (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS SANITY]} {[SQ ]} {[SQ ]}) (Com {[LIT_CHARS chmod]} {[LIT_CHARS a] [LIT_OTHER "+"] [LIT_CHARS w]} {[LIT_CHARS a]} < (FilenameRedirectNode filename={[LIT_CHARS /dev/null]} "> 2), > ) (Com {[LIT_CHARS rm]} {[LIT_CHARS -fr]} {[LIT_CHARS a]} {[LIT_CHARS b]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ subdir/file2/another &&\n"> ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ actual &&\n"> expect &&\n"> ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ ]}) (Com {[LIT_CHARS test_done]}) )