(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "Test merge with directory/file conflicts">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "prepare repository">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\techo Hello >init &&\n"> <LIT_CHARS "\tgit add init &&\n"> <LIT_CHARS "\tgit commit -m initial &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch B &&\n"> <LIT_CHARS "\tmkdir dir &&\n"> <LIT_CHARS "\techo foo >dir/foo &&\n"> <LIT_CHARS "\tgit add dir/foo &&\n"> <LIT_CHARS "\tgit commit -m \"File: dir/foo\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B &&\n"> <LIT_CHARS "\techo file dir >dir &&\n"> <LIT_CHARS "\tgit add dir &&\n"> <LIT_CHARS "\tgit commit -m \"File: dir\"\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Merge with d/f conflicts">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_expect_code 1 git merge \"merge msg\" B master\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "F/D conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout master &&\n"> <LIT_CHARS "\trm .git/index &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tmkdir before &&\n"> <LIT_CHARS "\techo FILE >before/one &&\n"> <LIT_CHARS "\techo FILE >after &&\n"> <LIT_CHARS "\tgit add . &&\n"> <LIT_CHARS "\tgit commit -m first &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -f after &&\n"> <LIT_CHARS "\tgit mv before after &&\n"> <LIT_CHARS "\tgit commit -m move &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b para HEAD^ &&\n"> <LIT_CHARS "\techo COMPLETELY ANOTHER FILE >another &&\n"> <LIT_CHARS "\tgit add . &&\n"> <LIT_CHARS "\tgit commit -m para &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit merge master\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup modify/delete + directory/file conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout --orphan modify &&\n"> <LIT_CHARS "\tgit rm -rf . &&\n"> <LIT_CHARS "\tgit clean -fdqx &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tprintf \"a\\nb\\nc\\nd\\ne\\nf\\ng\\nh\\n\" >letters &&\n"> <LIT_CHARS "\tgit add letters &&\n"> <LIT_CHARS "\tgit commit -m initial &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Throw in letters.txt for sorting order fun\n"> <LIT_CHARS "\t# (\"letters.txt\" sorts between \"letters\" and \"letters/file\")\n"> <LIT_CHARS "\techo i >>letters &&\n"> <LIT_CHARS "\techo \"version 2\" >letters.txt &&\n"> <LIT_CHARS "\tgit add letters letters.txt &&\n"> <LIT_CHARS "\tgit commit -m modified &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b delete HEAD^ &&\n"> <LIT_CHARS "\tgit rm letters &&\n"> <LIT_CHARS "\tmkdir letters &&\n"> <LIT_CHARS "\t>letters/file &&\n"> <LIT_CHARS "\techo \"version 1\" >letters.txt &&\n"> <LIT_CHARS "\tgit add letters letters.txt &&\n"> <LIT_CHARS "\tgit commit -m deleted\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "modify/delete + directory/file conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout delete^0 &&\n"> <LIT_CHARS "\ttest_must_fail git merge modify &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 5 -eq $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 4 -eq $(git ls-files -u | wc -l) &&\n"> <LIT_CHARS "\ttest 1 -eq $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest -f letters/file &&\n"> <LIT_CHARS "\ttest -f letters.txt &&\n"> <LIT_CHARS "\ttest -f letters~modify\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "modify/delete + directory/file conflict; other way">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t# Yes, we really need the double reset since \"letters\" appears as\n"> <LIT_CHARS "\t# both a file and a directory.\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit clean -f &&\n"> <LIT_CHARS "\tgit checkout modify^0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge delete &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest 5 -eq $(git ls-files -s | wc -l) &&\n"> <LIT_CHARS "\ttest 4 -eq $(git ls-files -u | wc -l) &&\n"> <LIT_CHARS "\ttest 1 -eq $(git ls-files -o | wc -l) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest -f letters/file &&\n"> <LIT_CHARS "\ttest -f letters.txt &&\n"> <LIT_CHARS "\ttest -f letters~HEAD\n">]}  )
  (Com {[LIT_CHARS test_done]}  )
)