(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "git blame on conflicted files">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup first case">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t# Create the old file\n"> <LIT_CHARS "\techo \"Old line\" > file1 &&\n"> <LIT_CHARS "\tgit add file1 &&\n"> <LIT_CHARS "\tgit commit --author \"Old Line <ol@localhost>\" -m file1.a &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Branch\n"> <LIT_CHARS "\tgit checkout -b foo &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Do an ugly move and change\n"> <LIT_CHARS "\tgit rm file1 &&\n"> <LIT_CHARS "\techo \"New line ...\"  > file2 &&\n"> <LIT_CHARS "\techo \"... and more\" >> file2 &&\n"> <LIT_CHARS "\tgit add file2 &&\n"> <LIT_CHARS "\tgit commit --author \"U Gly <ug@localhost>\" -m ugly &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Back to master and change something\n"> <LIT_CHARS "\tgit checkout master &&\n"> <LIT_CHARS "\techo \"\n"> <LIT_CHARS "\n"> <LIT_CHARS "bla\" >> file1 &&\n"> <LIT_CHARS "\tgit commit --author \"Old Line <ol@localhost>\" -a -m file1.b &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Back to foo and merge master\n"> <LIT_CHARS "\tgit checkout foo &&\n"> <LIT_CHARS "\tif git merge master; then\n"> <LIT_CHARS "\t\techo needed conflict here\n"> <LIT_CHARS "\t\texit 1\n"> <LIT_CHARS "\telse\n"> <LIT_CHARS "\t\techo merge failed - resolving automatically\n"> <LIT_CHARS "\tfi &&\n"> <LIT_CHARS "\techo \"New line ...\n"> <LIT_CHARS "... and more\n"> <LIT_CHARS "\n"> <LIT_CHARS "bla\n"> <LIT_CHARS "Even more\" > file2 &&\n"> <LIT_CHARS "\tgit rm file1 &&\n"> <LIT_CHARS "\tgit commit --author \"M Result <mr@localhost>\" -a -m merged &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Back to master and change file1 again\n"> <LIT_CHARS "\tgit checkout master &&\n"> <LIT_CHARS "\tsed s/bla/foo/ <file1 >X &&\n"> <LIT_CHARS "\trm file1 &&\n"> <LIT_CHARS "\tmv X file1 &&\n"> <LIT_CHARS "\tgit commit --author \"No Bla <nb@localhost>\" -a -m replace &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Try to merge into foo again\n"> <LIT_CHARS "\tgit checkout foo &&\n"> <LIT_CHARS "\tif git merge master; then\n"> <LIT_CHARS "\t\techo needed conflict here\n"> <LIT_CHARS "\t\texit 1\n"> <LIT_CHARS "\telse\n"> <LIT_CHARS "\t\techo merge failed - test is setup\n"> <LIT_CHARS "\tfi\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "blame runs on unconflicted file while other file has conflicts">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit blame file2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "blame does not crash with conflicted file in stages 1,3">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit blame file1\n">]})
  (Com {[LIT_CHARS test_done]})
)