(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "merge-recursive space options\n"> <LIT_CHARS "\n"> <LIT_CHARS "* [master] Clarify\n"> <LIT_CHARS " ! [remote] Remove cruft\n"> <LIT_CHARS "--\n"> <LIT_CHARS " + [remote] Remove cruft\n"> <LIT_CHARS "*  [master] Clarify\n"> <LIT_CHARS "*+ [remote^] Initial revision\n"> <LIT_CHARS "*   ok 1: setup\n">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]})
  (AndOr OP_AND_IF
    (Com {[LIT_CHARS test_have_prereq]} {[LIT_CHARS SED_STRIPS_CR]})
    (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('SED_OPTIONS', {[LIT_CHARS -b]})])
  )
  (If
    (Com {[LIT_CHARS test_have_prereq]} {[LIT_CHARS GREP_STRIPS_CR]})
    (List
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('GREP_OPTIONS', {[LIT_CHARS -U]})])
      (= scope=<EAssignScope.GLOBAL 1> flags=1 words=[{[LIT_CHARS GREP_OPTIONS]}] bindings=[])
    )
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS setup>]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tconflict_hunks () {\n"> <LIT_CHARS "\t\tsed $SED_OPTIONS -n -e \"\n"> <LIT_CHARS "\t\t\t/^<<<</ b conflict\n"> <LIT_CHARS "\t\t\tb\n"> <LIT_CHARS "\t\t\t: conflict\n"> <LIT_CHARS "\t\t\tp\n"> <LIT_CHARS "\t\t\t/^>>>>/ b\n"> <LIT_CHARS "\t\t\tn\n"> <LIT_CHARS "\t\t\tb conflict\n"> <LIT_CHARS "\t\t\" \"$@\"\n"> <LIT_CHARS "\t} &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tcat <<-\\EOF >text.txt &&\n"> <LIT_CHARS "\t    Hope, he says, cherishes the soul of him who lives in\n"> <LIT_CHARS "\t    justice and holiness and is the nurse of his age and the\n"> <LIT_CHARS "\t    companion of his journey;--hope which is mightiest to sway\n"> <LIT_CHARS "\t    the restless soul of man.\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tHow admirable are his words!  And the great blessing of riches, I do\n"> <LIT_CHARS "\tnot say to every man, but to a good man, is, that he has had no\n"> <LIT_CHARS "\toccasion to deceive or to defraud others, either intentionally or\n"> <LIT_CHARS "\tunintentionally; and when he departs to the world below he is not in\n"> <LIT_CHARS "\tany apprehension about offerings due to the gods or debts which he owes\n"> <LIT_CHARS "\tto men.  Now to this peace of mind the possession of wealth greatly\n"> <LIT_CHARS "\tcontributes; and therefore I say, that, setting one thing against\n"> <LIT_CHARS "\tanother, of the many advantages which wealth has to give, to a man of\n"> <LIT_CHARS "\tsense this is in my opinion the greatest.\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tWell said, Cephalus, I replied; but as concerning justice, what is\n"> <LIT_CHARS "\tit?--to speak the truth and to pay your debts--no more than this?  And\n"> <LIT_CHARS "\teven to this are there not exceptions?  Suppose that a friend when in\n"> <LIT_CHARS "\this right mind has deposited arms with me and he asks for them when he\n"> <LIT_CHARS "\tis not in his right mind, ought I to give them back to him?  No one\n"> <LIT_CHARS "\twould say that I ought or that I should be right in doing so, any more\n"> <LIT_CHARS "\tthan they would say that I ought always to speak the truth to one who\n"> <LIT_CHARS "\tis in his condition.\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tYou are quite right, he replied.\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tBut then, I said, speaking the truth and paying your debts is not a\n"> <LIT_CHARS "\tcorrect definition of justice.\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tCEPHALUS - SOCRATES - POLEMARCHUS\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tQuite correct, Socrates, if Simonides is to be believed, said\n"> <LIT_CHARS "\tPolemarchus interposing.\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tI fear, said Cephalus, that I must go now, for I have to look after the\n"> <LIT_CHARS "\tsacrifices, and I hand over the argument to Polemarchus and the company.\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tgit add text.txt &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"Initial revision\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b remote &&\n"> <LIT_CHARS "\tsed -e \"\n"> <LIT_CHARS "\t\t\ts/\\.  /\\. /g\n"> <LIT_CHARS "\t\t\ts/[?]  /? /g\n"> <LIT_CHARS "\t\t\ts/    /\t/g\n"> <LIT_CHARS "\t\t\ts/--/---/g\n"> <LIT_CHARS "\t\t\ts/but as concerning/but as con cerning/\n"> <LIT_CHARS "\t\t\t/CEPHALUS - SOCRATES - POLEMARCHUS/ d\n"> <LIT_CHARS "\t\t\" text.txt >text.txt+ &&\n"> <LIT_CHARS "\tmv text.txt+ text.txt &&\n"> <LIT_CHARS "\tgit commit -a -m \"Remove cruft\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout master &&\n"> <LIT_CHARS "\tsed -e \"\n"> <LIT_CHARS "\t\t\ts/\\(not in his right mind\\),\\(.*\\)/\\1;\\2Q/\n"> <LIT_CHARS "\t\t\ts/Quite correct\\(.*\\)/It is too correct\\1Q/\n"> <LIT_CHARS "\t\t\ts/unintentionally/un intentionally/\n"> <LIT_CHARS "\t\t\t/un intentionally/ s/$/Q/\n"> <LIT_CHARS "\t\t\ts/Polemarchus interposing./Polemarchus, interposing.Q/\n"> <LIT_CHARS "\t\t\t/justice and holiness/ s/$/Q/\n"> <LIT_CHARS "\t\t\t/pay your debts/ s/$/Q/\n"> <LIT_CHARS "\t\t\" text.txt | q_to_cr >text.txt+ &&\n"> <LIT_CHARS "\tmv text.txt+ text.txt &&\n"> <LIT_CHARS "\tgit commit -a -m \"Clarify\" &&\n"> <LIT_CHARS "\tgit show-branch --all\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "naive merge fails">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit read-tree --reset -u HEAD &&\n"> <LIT_CHARS "\ttest_must_fail git merge-recursive HEAD^ -- HEAD remote &&\n"> <LIT_CHARS "\ttest_must_fail git update-index --refresh &&\n"> <LIT_CHARS "\tgrep \"<<<<<<\" text.txt\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--ignore-space-change makes merge succeed">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit read-tree --reset -u HEAD &&\n"> <LIT_CHARS "\tgit merge-recursive --ignore-space-change HEAD^ -- HEAD remote\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "naive cherry-pick fails">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit read-tree --reset -u HEAD &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick --no-commit remote &&\n"> <LIT_CHARS "\tgit read-tree --reset -u HEAD &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick remote &&\n"> <LIT_CHARS "\ttest_must_fail git update-index --refresh &&\n"> <LIT_CHARS "\tgrep \"<<<<<<\" text.txt\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "-Xignore-space-change makes cherry-pick succeed">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit read-tree --reset -u HEAD &&\n"> <LIT_CHARS "\tgit cherry-pick --no-commit -Xignore-space-change remote\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--ignore-space-change: our w/s-only change wins">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tq_to_cr <<-\\EOF >expected &&\n"> <LIT_CHARS "\t    justice and holiness and is the nurse of his age and theQ\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit read-tree --reset -u HEAD &&\n"> <LIT_CHARS "\tgit merge-recursive --ignore-space-change HEAD^ -- HEAD remote &&\n"> <LIT_CHARS "\tgrep \"justice and holiness\" text.txt >actual &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--ignore-space-change: their real change wins over w/s">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tcat <<-\\EOF >expected &&\n"> <LIT_CHARS "\tit?---to speak the truth and to pay your debts---no more than this? And\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit read-tree --reset -u HEAD &&\n"> <LIT_CHARS "\tgit merge-recursive --ignore-space-change HEAD^ -- HEAD remote &&\n"> <LIT_CHARS "\tgrep \"pay your debts\" text.txt >actual &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--ignore-space-change: does not ignore new spaces">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tcat <<-\\EOF >expected1 &&\n"> <LIT_CHARS "\tWell said, Cephalus, I replied; but as con cerning justice, what is\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tq_to_cr <<-\\EOF >expected2 &&\n"> <LIT_CHARS "\tun intentionally; and when he departs to the world below he is not inQ\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit read-tree --reset -u HEAD &&\n"> <LIT_CHARS "\tgit merge-recursive --ignore-space-change HEAD^ -- HEAD remote &&\n"> <LIT_CHARS "\tgrep \"Well said\" text.txt >actual1 &&\n"> <LIT_CHARS "\tgrep \"when he departs\" text.txt >actual2 &&\n"> <LIT_CHARS "\ttest_cmp expected1 actual1 &&\n"> <LIT_CHARS "\ttest_cmp expected2 actual2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--ignore-all-space drops their new spaces">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tcat <<-\\EOF >expected &&\n"> <LIT_CHARS "\tWell said, Cephalus, I replied; but as concerning justice, what is\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit read-tree --reset -u HEAD &&\n"> <LIT_CHARS "\tgit merge-recursive --ignore-all-space HEAD^ -- HEAD remote &&\n"> <LIT_CHARS "\tgrep \"Well said\" text.txt >actual &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--ignore-all-space keeps our new spaces">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tq_to_cr <<-\\EOF >expected &&\n"> <LIT_CHARS "\tun intentionally; and when he departs to the world below he is not inQ\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit read-tree --reset -u HEAD &&\n"> <LIT_CHARS "\tgit merge-recursive --ignore-all-space HEAD^ -- HEAD remote &&\n"> <LIT_CHARS "\tgrep \"when he departs\" text.txt >actual &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS --ignore-space-at-eol>]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tq_to_cr <<-\\EOF >expected &&\n"> <LIT_CHARS "\t<<<<<<< HEAD\n"> <LIT_CHARS "\tis not in his right mind; ought I to give them back to him?  No oneQ\n"> <LIT_CHARS "\t=======\n"> <LIT_CHARS "\tis not in his right mind, ought I to give them back to him? No one\n"> <LIT_CHARS "\t>>>>>>> remote\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit read-tree --reset -u HEAD &&\n"> <LIT_CHARS "\ttest_must_fail git merge-recursive --ignore-space-at-eol \\\n"> <LIT_CHARS "\t\t\t\t\t\t HEAD^ -- HEAD remote &&\n"> <LIT_CHARS "\tconflict_hunks text.txt >actual &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_done]})
)