(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "Three way merge with read-tree -m\n"> <LIT_CHARS "\n"> <LIT_CHARS "This test tries three-way merge with read-tree -m\n"> <LIT_CHARS "\n"> <LIT_CHARS "There is one ancestor (called O for Original) and two branches A\n"> <LIT_CHARS "and B derived from it.  We want to do a 3-way merge between A and\n"> <LIT_CHARS "B, using O as the common ancestor.\n"> <LIT_CHARS "\n"> <LIT_CHARS "    merge A O B\n"> <LIT_CHARS "\n"> <LIT_CHARS "Decisions are made by comparing contents of O, A and B pathname\n"> <LIT_CHARS "by pathname.  The result is determined by the following guiding\n"> <LIT_CHARS "principle:\n"> <LIT_CHARS "\n"> <LIT_CHARS " - If only A does something to it and B does not touch it, take\n"> <LIT_CHARS "   whatever A does.\n"> <LIT_CHARS "\n"> <LIT_CHARS " - If only B does something to it and A does not touch it, take\n"> <LIT_CHARS "   whatever B does.\n"> <LIT_CHARS "\n"> <LIT_CHARS " - If both A and B does something but in the same way, take\n"> <LIT_CHARS "   whatever they do.\n"> <LIT_CHARS "\n"> <LIT_CHARS " - If A and B does something but different things, we need a\n"> <LIT_CHARS "   3-way merge:\n"> <LIT_CHARS "\n"> <LIT_CHARS "   - We cannot do anything about the following cases:\n"> <LIT_CHARS "\n"> <LIT_CHARS "     * O does not have it.  A and B both must be adding to the\n"> <LIT_CHARS "       same path independently.\n"> <LIT_CHARS "\n"> <LIT_CHARS "     * A deletes it.  B must be modifying.\n"> <LIT_CHARS "\n"> <LIT_CHARS "   - Otherwise, A and B are modifying.  Run 3-way merge.\n"> <LIT_CHARS "\n"> <LIT_CHARS "First, the case matrix.\n"> <LIT_CHARS "\n"> <LIT_CHARS " - Vertical axis is for A">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "s actions.\n"> <LIT_CHARS " - Horizontal axis is for B">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "s actions.\n"> <LIT_CHARS "\n"> <LIT_CHARS ".----------------------------------------------------------------.\n"> <LIT_CHARS "| A        B | No Action  |   Delete   |   Modify   |    Add     |\n"> <LIT_CHARS "|------------+------------+------------+------------+------------|\n"> <LIT_CHARS "| No Action  |            |            |            |            |\n"> <LIT_CHARS "|            | select O   | delete     | select B   | select B   |\n"> <LIT_CHARS "|            |            |            |            |            |\n"> <LIT_CHARS "|------------+------------+------------+------------+------------|\n"> <LIT_CHARS "| Delete     |            |            | ********** |    can     |\n"> <LIT_CHARS "|            | delete     | delete     | merge      |    not     |\n"> <LIT_CHARS "|            |            |            |            |  happen    |\n"> <LIT_CHARS "|------------+------------+------------+------------+------------|\n"> <LIT_CHARS "| Modify     |            | ********** | ?????????? |    can     |\n"> <LIT_CHARS "|            | select A   | merge      | select A=B |    not     |\n"> <LIT_CHARS "|            |            |            | merge      |  happen    |\n"> <LIT_CHARS "|------------+------------+------------+------------+------------|\n"> <LIT_CHARS "| Add        |            |    can     |    can     | ?????????? |\n"> <LIT_CHARS "|            | select A   |    not     |    not     | select A=B |\n"> <LIT_CHARS "|            |            |  happen    |  happen    | merge      |\n"> <LIT_CHARS ".----------------------------------------------------------------.\n"> <LIT_CHARS "\n"> <LIT_CHARS "In addition:\n"> <LIT_CHARS "\n"> <LIT_CHARS " SS: a special case of MM, where A and B makes the same modification.\n"> <LIT_CHARS " LL: a special case of AA, where A and B creates the same file.\n"> <LIT_CHARS " TT: a special case of MM, where A and B makes mergeable changes.\n"> <LIT_CHARS " DF: a special case, where A makes a directory and B makes a file.\n"> <LIT_CHARS "\n">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]}  )
  (Com {[LIT_CHARS .]} {[DQ [VarSub TEST_DIRECTORY]] [LIT_CHARS /lib-read-tree.sh]}  )
  (Com {[LIT_CHARS .]} {[DQ [VarSub TEST_DIRECTORY]] [LIT_CHARS /lib-read-tree-m-3way.sh]}  )
  (Com {[LIT_CHARS cat]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS expected]} <REDIR_GREAT ">"> 1),
    (HereDocRedirectNode here_end='EOF' do_expansion=False body_word={[LIT_CHARS "100644 X 2\tAA\n"] [LIT_CHARS "100644 X 3\tAA\n"] [LIT_CHARS "100644 X 0\tAN\n"] [LIT_CHARS "100644 X 1\tDD\n"] [LIT_CHARS "100644 X 3\tDF\n"] [LIT_CHARS "100644 X 2\tDF/DF\n"] [LIT_CHARS "100644 X 1\tDM\n"] [LIT_CHARS "100644 X 3\tDM\n"] [LIT_CHARS "100644 X 1\tDN\n"] [LIT_CHARS "100644 X 3\tDN\n"] [LIT_CHARS "100644 X 0\tLL\n"] [LIT_CHARS "100644 X 1\tMD\n"] [LIT_CHARS "100644 X 2\tMD\n"] [LIT_CHARS "100644 X 1\tMM\n"] [LIT_CHARS "100644 X 2\tMM\n"] [LIT_CHARS "100644 X 3\tMM\n"] [LIT_CHARS "100644 X 0\tMN\n"] [LIT_CHARS "100644 X 0\tNA\n"] [LIT_CHARS "100644 X 1\tND\n"] [LIT_CHARS "100644 X 2\tND\n"] [LIT_CHARS "100644 X 0\tNM\n"] [LIT_CHARS "100644 X 0\tNN\n"] [LIT_CHARS "100644 X 0\tSS\n"] [LIT_CHARS "100644 X 1\tTT\n"] [LIT_CHARS "100644 X 2\tTT\n"] [LIT_CHARS "100644 X 3\tTT\n"] [LIT_CHARS "100644 X 2\tZ/AA\n"] [LIT_CHARS "100644 X 3\tZ/AA\n"] [LIT_CHARS "100644 X 0\tZ/AN\n"] [LIT_CHARS "100644 X 1\tZ/DD\n"] [LIT_CHARS "100644 X 1\tZ/DM\n"] [LIT_CHARS "100644 X 3\tZ/DM\n"] [LIT_CHARS "100644 X 1\tZ/DN\n"] [LIT_CHARS "100644 X 3\tZ/DN\n"] [LIT_CHARS "100644 X 1\tZ/MD\n"] [LIT_CHARS "100644 X 2\tZ/MD\n"] [LIT_CHARS "100644 X 1\tZ/MM\n"] [LIT_CHARS "100644 X 2\tZ/MM\n"] [LIT_CHARS "100644 X 3\tZ/MM\n"] [LIT_CHARS "100644 X 0\tZ/MN\n"] [LIT_CHARS "100644 X 0\tZ/NA\n"] [LIT_CHARS "100644 X 1\tZ/ND\n"] [LIT_CHARS "100644 X 2\tZ/ND\n"] [LIT_CHARS "100644 X 0\tZ/NM\n"] [LIT_CHARS "100644 X 0\tZ/NN\n"]} <REDIR_DLESS "<<"> 0),
    >
  )
  (FunctionDef check_result []
    (AndOr OP_AND_IF
      (Pipeline
        (Com {[LIT_CHARS git]} {[LIT_CHARS ls-files]} {[LIT_CHARS --stage]}        )
        (Com {[LIT_CHARS sed]} {[LIT_CHARS -e]} {[SQ <LIT_CHARS "s/ ">] [DQ [VarSub _x40]] [SQ <LIT_CHARS " / X /">]}
          <
          (FilenameRedirectNode filename={[LIT_CHARS current]} <REDIR_GREAT ">"> 1),
          >
        )
      )
      (Com {[LIT_CHARS test_cmp]} {[LIT_CHARS expected]} {[LIT_CHARS current]}      )
    )
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "3-way merge with git read-tree -m, empty cache">]} {[DQ [LIT_CHARS "rm -fr [NDMALTS][NDMALTSF] Z &&\n"][LIT_CHARS "     rm .git/index &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "3-way merge with git read-tree -m, match H">]} {[DQ [LIT_CHARS "rm -fr [NDMALTS][NDMALTSF] Z &&\n"][LIT_CHARS "     rm .git/index &&\n"][LIT_CHARS "     read_tree_must_succeed "][VarSub tree_A][LIT_CHARS " &&\n"][LIT_CHARS "     git checkout-index -f -u -a &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_OTHER ":"]}
    <
    (HereDocRedirectNode here_end='END_OF_CASE_TABLE' do_expansion=False body_word={[LIT_CHARS "\n"] [LIT_CHARS "We have so far tested only empty index and clean-and-matching-A index\n"] [LIT_CHARS "case which are trivial.  Make sure index requirements are also\n"] [LIT_CHARS "checked.\n"] [LIT_CHARS "\n"] [LIT_CHARS "\"git read-tree -m O A B\"\n"] [LIT_CHARS "\n"] [LIT_CHARS "     O       A       B         result      index requirements\n"] [LIT_CHARS "-------------------------------------------------------------------\n"] [LIT_CHARS "  1  missing missing missing   -           must not exist.\n"] [LIT_CHARS " ------------------------------------------------------------------\n"] [LIT_CHARS "  2  missing missing exists    take B*     must match B, if exists.\n"] [LIT_CHARS " ------------------------------------------------------------------\n"] [LIT_CHARS "  3  missing exists  missing   take A*     must match A, if exists.\n"] [LIT_CHARS " ------------------------------------------------------------------\n"] [LIT_CHARS "  4  missing exists  A!=B      no merge    must match A and be\n"] [LIT_CHARS "                                           up-to-date, if exists.\n"] [LIT_CHARS " ------------------------------------------------------------------\n"] [LIT_CHARS "  5  missing exists  A==B      take A      must match A, if exists.\n"] [LIT_CHARS " ------------------------------------------------------------------\n"] [LIT_CHARS "  6  exists  missing missing   remove      must not exist.\n"] [LIT_CHARS " ------------------------------------------------------------------\n"] [LIT_CHARS "  7  exists  missing O!=B      no merge    must not exist.\n"] [LIT_CHARS " ------------------------------------------------------------------\n"] [LIT_CHARS "  8  exists  missing O==B      remove      must not exist.\n"] [LIT_CHARS " ------------------------------------------------------------------\n"] [LIT_CHARS "  9  exists  O!=A    missing   no merge    must match A and be\n"] [LIT_CHARS "                                           up-to-date, if exists.\n"] [LIT_CHARS " ------------------------------------------------------------------\n"] [LIT_CHARS " 10  exists  O==A    missing   no merge    must match A\n"] [LIT_CHARS " ------------------------------------------------------------------\n"] [LIT_CHARS " 11  exists  O!=A    O!=B      no merge    must match A and be\n"] [LIT_CHARS "                     A!=B                  up-to-date, if exists.\n"] [LIT_CHARS " ------------------------------------------------------------------\n"] [LIT_CHARS " 12  exists  O!=A    O!=B      take A      must match A, if exists.\n"] [LIT_CHARS "                     A==B\n"] [LIT_CHARS " ------------------------------------------------------------------\n"] [LIT_CHARS " 13  exists  O!=A    O==B      take A      must match A, if exists.\n"] [LIT_CHARS " ------------------------------------------------------------------\n"] [LIT_CHARS " 14  exists  O==A    O!=B      take B      if exists, must either (1)\n"] [LIT_CHARS "                                           match A and be up-to-date,\n"] [LIT_CHARS "                                           or (2) match B.\n"] [LIT_CHARS " ------------------------------------------------------------------\n"] [LIT_CHARS " 15  exists  O==A    O==B      take B      must match A if exists.\n"] [LIT_CHARS " ------------------------------------------------------------------\n"] [LIT_CHARS " 16  exists  O==A    O==B      barf        must match A if exists.\n"] [LIT_CHARS "     *multi* in one  in another\n"] [LIT_CHARS "-------------------------------------------------------------------\n"] [LIT_CHARS "\n"] [LIT_CHARS "Note: we need to be careful in case 2 and 3.  The tree A may contain\n"] [LIT_CHARS "DF (file) when tree B require DF to be a directory by having DF/DF\n"] [LIT_CHARS "(file).\n"] [LIT_CHARS "\n"]} <REDIR_DLESS "<<"> 0),
    >
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "1 - must not have an entry not in A.">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index XX &&\n"][LIT_CHARS "     echo XX >XX &&\n"][LIT_CHARS "     git update-index --add XX &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "2 - must match B in !O && !A && B case.">]} {[DQ [LIT_CHARS "rm -f .git/index NA &&\n"][LIT_CHARS "     cp .orig-B/NA NA &&\n"][LIT_CHARS "     git update-index --add NA &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "2 - matching B alone is OK in !O && !A && B case.">]} {[DQ [LIT_CHARS "rm -f .git/index NA &&\n"][LIT_CHARS "     cp .orig-B/NA NA &&\n"][LIT_CHARS "     git update-index --add NA &&\n"][LIT_CHARS "     echo extra >>NA &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "3 - must match A in !O && A && !B case.">]} {[DQ [LIT_CHARS "rm -f .git/index AN &&\n"][LIT_CHARS "     cp .orig-A/AN AN &&\n"][LIT_CHARS "     git update-index --add AN &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "3 - matching A alone is OK in !O && A && !B case.">]} {[DQ [LIT_CHARS "rm -f .git/index AN &&\n"][LIT_CHARS "     cp .orig-A/AN AN &&\n"][LIT_CHARS "     git update-index --add AN &&\n"][LIT_CHARS "     echo extra >>AN &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "3 (fail) - must match A in !O && A && !B case.">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index AN &&\n"][LIT_CHARS "     cp .orig-A/AN AN &&\n"][LIT_CHARS "     echo extra >>AN &&\n"][LIT_CHARS "     git update-index --add AN &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "4 - must match and be up-to-date in !O && A && B && A!=B case.">]} {[DQ [LIT_CHARS "rm -f .git/index AA &&\n"][LIT_CHARS "     cp .orig-A/AA AA &&\n"][LIT_CHARS "     git update-index --add AA &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index AA &&\n"][LIT_CHARS "     cp .orig-A/AA AA &&\n"][LIT_CHARS "     git update-index --add AA &&\n"][LIT_CHARS "     echo extra >>AA &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index AA &&\n"][LIT_CHARS "     cp .orig-A/AA AA &&\n"][LIT_CHARS "     echo extra >>AA &&\n"][LIT_CHARS "     git update-index --add AA &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "5 - must match in !O && A && B && A==B case.">]} {[DQ [LIT_CHARS "rm -f .git/index LL &&\n"][LIT_CHARS "     cp .orig-A/LL LL &&\n"][LIT_CHARS "     git update-index --add LL &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "5 - must match in !O && A && B && A==B case.">]} {[DQ [LIT_CHARS "rm -f .git/index LL &&\n"][LIT_CHARS "     cp .orig-A/LL LL &&\n"][LIT_CHARS "     git update-index --add LL &&\n"][LIT_CHARS "     echo extra >>LL &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "5 (fail) - must match A in !O && A && B && A==B case.">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index LL &&\n"][LIT_CHARS "     cp .orig-A/LL LL &&\n"][LIT_CHARS "     echo extra >>LL &&\n"][LIT_CHARS "     git update-index --add LL &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "6 - must not exist in O && !A && !B case">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index DD &&\n"][LIT_CHARS "     echo DD >DD &&\n"][LIT_CHARS "     git update-index --add DD &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "7 - must not exist in O && !A && B && O!=B case">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index DM &&\n"][LIT_CHARS "     cp .orig-B/DM DM &&\n"][LIT_CHARS "     git update-index --add DM &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "8 - must not exist in O && !A && B && O==B case">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index DN &&\n"][LIT_CHARS "     cp .orig-B/DN DN &&\n"][LIT_CHARS "     git update-index --add DN &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "9 - must match and be up-to-date in O && A && !B && O!=A case">]} {[DQ [LIT_CHARS "rm -f .git/index MD &&\n"][LIT_CHARS "     cp .orig-A/MD MD &&\n"][LIT_CHARS "     git update-index --add MD &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "9 (fail) - must match and be up-to-date in O && A && !B && O!=A case">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index MD &&\n"][LIT_CHARS "     cp .orig-A/MD MD &&\n"][LIT_CHARS "     git update-index --add MD &&\n"][LIT_CHARS "     echo extra >>MD &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "9 (fail) - must match and be up-to-date in O && A && !B && O!=A case">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index MD &&\n"][LIT_CHARS "     cp .orig-A/MD MD &&\n"][LIT_CHARS "     echo extra >>MD &&\n"][LIT_CHARS "     git update-index --add MD &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "10 - must match and be up-to-date in O && A && !B && O==A case">]} {[DQ [LIT_CHARS "rm -f .git/index ND &&\n"][LIT_CHARS "     cp .orig-A/ND ND &&\n"][LIT_CHARS "     git update-index --add ND &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "10 (fail) - must match and be up-to-date in O && A && !B && O==A case">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index ND &&\n"][LIT_CHARS "     cp .orig-A/ND ND &&\n"][LIT_CHARS "     git update-index --add ND &&\n"][LIT_CHARS "     echo extra >>ND &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "10 (fail) - must match and be up-to-date in O && A && !B && O==A case">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index ND &&\n"][LIT_CHARS "     cp .orig-A/ND ND &&\n"][LIT_CHARS "     echo extra >>ND &&\n"][LIT_CHARS "     git update-index --add ND &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case">]} {[DQ [LIT_CHARS "rm -f .git/index MM &&\n"][LIT_CHARS "     cp .orig-A/MM MM &&\n"][LIT_CHARS "     git update-index --add MM &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index MM &&\n"][LIT_CHARS "     cp .orig-A/MM MM &&\n"][LIT_CHARS "     git update-index --add MM &&\n"][LIT_CHARS "     echo extra >>MM &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index MM &&\n"][LIT_CHARS "     cp .orig-A/MM MM &&\n"][LIT_CHARS "     echo extra >>MM &&\n"][LIT_CHARS "     git update-index --add MM &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "12 - must match A in O && A && B && O!=A && A==B case">]} {[DQ [LIT_CHARS "rm -f .git/index SS &&\n"][LIT_CHARS "     cp .orig-A/SS SS &&\n"][LIT_CHARS "     git update-index --add SS &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "12 - must match A in O && A && B && O!=A && A==B case">]} {[DQ [LIT_CHARS "rm -f .git/index SS &&\n"][LIT_CHARS "     cp .orig-A/SS SS &&\n"][LIT_CHARS "     git update-index --add SS &&\n"][LIT_CHARS "     echo extra >>SS &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "12 (fail) - must match A in O && A && B && O!=A && A==B case">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index SS &&\n"][LIT_CHARS "     cp .orig-A/SS SS &&\n"][LIT_CHARS "     echo extra >>SS &&\n"][LIT_CHARS "     git update-index --add SS &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "13 - must match A in O && A && B && O!=A && O==B case">]} {[DQ [LIT_CHARS "rm -f .git/index MN &&\n"][LIT_CHARS "     cp .orig-A/MN MN &&\n"][LIT_CHARS "     git update-index --add MN &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "13 - must match A in O && A && B && O!=A && O==B case">]} {[DQ [LIT_CHARS "rm -f .git/index MN &&\n"][LIT_CHARS "     cp .orig-A/MN MN &&\n"][LIT_CHARS "     git update-index --add MN &&\n"][LIT_CHARS "     echo extra >>MN &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "14 - must match and be up-to-date in O && A && B && O==A && O!=B case">]} {[DQ [LIT_CHARS "rm -f .git/index NM &&\n"][LIT_CHARS "     cp .orig-A/NM NM &&\n"][LIT_CHARS "     git update-index --add NM &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "14 - may match B in O && A && B && O==A && O!=B case">]} {[DQ [LIT_CHARS "rm -f .git/index NM &&\n"][LIT_CHARS "     cp .orig-B/NM NM &&\n"][LIT_CHARS "     git update-index --add NM &&\n"][LIT_CHARS "     echo extra >>NM &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index NM &&\n"][LIT_CHARS "     cp .orig-A/NM NM &&\n"][LIT_CHARS "     git update-index --add NM &&\n"][LIT_CHARS "     echo extra >>NM &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index NM &&\n"][LIT_CHARS "     cp .orig-A/NM NM &&\n"][LIT_CHARS "     echo extra >>NM &&\n"][LIT_CHARS "     git update-index --add NM &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "15 - must match A in O && A && B && O==A && O==B case">]} {[DQ [LIT_CHARS "rm -f .git/index NN &&\n"][LIT_CHARS "     cp .orig-A/NN NN &&\n"][LIT_CHARS "     git update-index --add NN &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "15 - must match A in O && A && B && O==A && O==B case">]} {[DQ [LIT_CHARS "rm -f .git/index NN &&\n"][LIT_CHARS "     cp .orig-A/NN NN &&\n"][LIT_CHARS "     git update-index --add NN &&\n"][LIT_CHARS "     echo extra >>NN &&\n"][LIT_CHARS "     read_tree_must_succeed -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS " &&\n"][LIT_CHARS "     check_result"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "15 (fail) - must match A in O && A && B && O==A && O==B case">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "     rm -f .git/index NN &&\n"][LIT_CHARS "     cp .orig-A/NN NN &&\n"][LIT_CHARS "     echo extra >>NN &&\n"][LIT_CHARS "     git update-index --add NN &&\n"][LIT_CHARS "     read_tree_must_fail -m "][VarSub tree_O][LIT_CHARS " "][VarSub tree_A][LIT_CHARS " "][VarSub tree_B][LIT_CHARS "\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "16 - A matches in one and B matches in another.">]} {[SQ <LIT_CHARS "rm -f .git/index F16 &&\n"> <LIT_CHARS "    echo F16 >F16 &&\n"> <LIT_CHARS "    git update-index --add F16 &&\n"> <LIT_CHARS "    tree0=`git write-tree` &&\n"> <LIT_CHARS "    echo E16 >F16 &&\n"> <LIT_CHARS "    git update-index F16 &&\n"> <LIT_CHARS "    tree1=`git write-tree` &&\n"> <LIT_CHARS "    read_tree_must_succeed -m $tree0 $tree1 $tree1 $tree0 &&\n"> <LIT_CHARS "    git ls-files --stage">]}  )
  (Com {[LIT_CHARS test_done]}  )
)