(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "git merge\n"> <LIT_CHARS "\n"> <LIT_CHARS "Testing basic merge operations/option parsing.\n"> <LIT_CHARS "\n"> <LIT_CHARS "! [c0] commit 0\n"> <LIT_CHARS " ! [c1] commit 1\n"> <LIT_CHARS "  ! [c2] commit 2\n"> <LIT_CHARS "   ! [c3] commit 3\n"> <LIT_CHARS "    ! [c4] c4\n"> <LIT_CHARS "     ! [c5] c5\n"> <LIT_CHARS "      ! [c6] c6\n"> <LIT_CHARS "       * [master] Merge commit ">] [LIT_CHARS c1] [SQ <LIT_CHARS "\n"> <LIT_CHARS "--------\n"> <LIT_CHARS "       - [master] Merge commit ">] [LIT_CHARS c1] [SQ <LIT_CHARS "\n"> <LIT_CHARS " +     * [c1] commit 1\n"> <LIT_CHARS "      +  [c6] c6\n"> <LIT_CHARS "     +   [c5] c5\n"> <LIT_CHARS "    ++   [c4] c4\n"> <LIT_CHARS "   ++++  [c3] commit 3\n"> <LIT_CHARS "  +      [c2] commit 2\n"> <LIT_CHARS "+++++++* [c0] commit 0\n">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]}  )
  (Com {[LIT_CHARS .]} {[DQ [VarSub TEST_DIRECTORY]] [LIT_CHARS /lib-gpg.sh]}  )
  (Com {[LIT_CHARS printf]} {[SQ <LIT_CHARS "%s\\n">]} {[LIT_CHARS 1]} {[LIT_CHARS 2]} {[LIT_CHARS 3]} {[LIT_CHARS 4]} {[LIT_CHARS 5]} {[LIT_CHARS 6]} {[LIT_CHARS 7]} {[LIT_CHARS 8]} {[LIT_CHARS 9]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS file]} <REDIR_GREAT ">"> 1),
    >
  )
  (Com {[LIT_CHARS printf]} {[SQ <LIT_CHARS "%s\\n">]} {[SQ <LIT_CHARS "1 X">]} {[LIT_CHARS 2]} {[LIT_CHARS 3]} {[LIT_CHARS 4]} {[LIT_CHARS 5]} {[LIT_CHARS 6]} {[LIT_CHARS 7]} {[LIT_CHARS 8]} {[LIT_CHARS 9]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS file.1]} <REDIR_GREAT ">"> 1),
    >
  )
  (Com {[LIT_CHARS printf]} {[SQ <LIT_CHARS "%s\\n">]} {[LIT_CHARS 1]} {[LIT_CHARS 2]} {[LIT_CHARS 3]} {[LIT_CHARS 4]} {[SQ <LIT_CHARS "5 X">]} {[LIT_CHARS 6]} {[LIT_CHARS 7]} {[LIT_CHARS 8]} {[LIT_CHARS 9]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS file.5]} <REDIR_GREAT ">"> 1),
    >
  )
  (Com {[LIT_CHARS printf]} {[SQ <LIT_CHARS "%s\\n">]} {[LIT_CHARS 1]} {[LIT_CHARS 2]} {[LIT_CHARS 3]} {[LIT_CHARS 4]} {[LIT_CHARS 5]} {[LIT_CHARS 6]} {[LIT_CHARS 7]} {[LIT_CHARS 8]} {[SQ <LIT_CHARS "9 X">]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS file.9]} <REDIR_GREAT ">"> 1),
    >
  )
  (Com {[LIT_CHARS printf]} {[SQ <LIT_CHARS "%s\\n">]} {[SQ <LIT_CHARS "1 X">]} {[LIT_CHARS 2]} {[LIT_CHARS 3]} {[LIT_CHARS 4]} {[LIT_CHARS 5]} {[LIT_CHARS 6]} {[LIT_CHARS 7]} {[LIT_CHARS 8]} {[LIT_CHARS 9]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS result.1]} <REDIR_GREAT ">"> 1),
    >
  )
  (Com {[LIT_CHARS printf]} {[SQ <LIT_CHARS "%s\\n">]} {[SQ <LIT_CHARS "1 X">]} {[LIT_CHARS 2]} {[LIT_CHARS 3]} {[LIT_CHARS 4]} {[SQ <LIT_CHARS "5 X">]} {[LIT_CHARS 6]} {[LIT_CHARS 7]} {[LIT_CHARS 8]} {[LIT_CHARS 9]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS result.1-5]} <REDIR_GREAT ">"> 1),
    >
  )
  (Com {[LIT_CHARS printf]} {[SQ <LIT_CHARS "%s\\n">]} {[SQ <LIT_CHARS "1 X">]} {[LIT_CHARS 2]} {[LIT_CHARS 3]} {[LIT_CHARS 4]} {[SQ <LIT_CHARS "5 X">]} {[LIT_CHARS 6]} {[LIT_CHARS 7]} {[LIT_CHARS 8]} {[SQ <LIT_CHARS "9 X">]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS result.1-5-9]} <REDIR_GREAT ">"> 1),
    >
  )
  (Com 
    <
    (FilenameRedirectNode filename={[LIT_CHARS empty]} <REDIR_GREAT ">"> 1),
    >
  )
  (FunctionDef create_merge_msgs []
    (AndOr OP_AND_IF
      (Com {[LIT_CHARS echo]} {[DQ [LIT_CHARS "Merge tag 'c2'"]]}
        <
        (FilenameRedirectNode filename={[LIT_CHARS msg.1-5]} <REDIR_GREAT ">"> 1),
        >
      )
      (AndOr OP_AND_IF
        (Com {[LIT_CHARS echo]} {[DQ [LIT_CHARS "Merge tags 'c2' and 'c3'"]]}
          <
          (FilenameRedirectNode filename={[LIT_CHARS msg.1-5-9]} <REDIR_GREAT ">"> 1),
          >
        )
        (AndOr OP_AND_IF
          (AndOr OP_AND_IF
            (Com {[LIT_CHARS echo]} {[DQ [LIT_CHARS "Squashed commit of the following:"]]}            )
            (AndOr OP_AND_IF
              (Com {[LIT_CHARS echo]}              )
              (Com {[LIT_CHARS git]} {[LIT_CHARS log]} {[LIT_CHARS --no-merges]} {[LIT_OTHER "^"] [LIT_CHARS HEAD]} {[LIT_CHARS c1]}              )
            )
          )
          (AndOr OP_AND_IF
            (AndOr OP_AND_IF
              (Com {[LIT_CHARS echo]} {[DQ [LIT_CHARS "Squashed commit of the following:"]]}              )
              (AndOr OP_AND_IF
                (Com {[LIT_CHARS echo]}                )
                (Com {[LIT_CHARS git]} {[LIT_CHARS log]} {[LIT_CHARS --no-merges]} {[LIT_OTHER "^"] [LIT_CHARS HEAD]} {[LIT_CHARS c2]}                )
              )
            )
            (AndOr OP_AND_IF
              (AndOr OP_AND_IF
                (Com {[LIT_CHARS echo]} {[DQ [LIT_CHARS "Squashed commit of the following:"]]}                )
                (AndOr OP_AND_IF
                  (Com {[LIT_CHARS echo]}                  )
                  (Com {[LIT_CHARS git]} {[LIT_CHARS log]} {[LIT_CHARS --no-merges]} {[LIT_OTHER "^"] [LIT_CHARS HEAD]} {[LIT_CHARS c2]} {[LIT_CHARS c3]}                  )
                )
              )
              (AndOr OP_AND_IF
                (Com {[LIT_CHARS echo]}
                  <
                  (FilenameRedirectNode filename={[LIT_CHARS msg.nolog]} <REDIR_GREAT ">"> 1),
                  >
                )
                (AndOr OP_AND_IF
                  (Com {[LIT_CHARS echo]} {[DQ [LIT_CHARS "* tag 'c3':"]]}                  )
                  (AndOr OP_AND_IF
                    (Com {[LIT_CHARS echo]} {[DQ [LIT_CHARS "  commit 3"]]}                    )
                    (Com {[LIT_CHARS echo]}                    )
                  )
                )
              )
            )
          )
        )
      )
    )
  )
  (FunctionDef verify_merge []
    (AndOr OP_AND_IF
      (Com {[LIT_CHARS test_cmp]} {[DQ [VarSub 2]]} {[DQ [VarSub 1]]}      )
      (AndOr OP_AND_IF
        (Com {[LIT_CHARS git]} {[LIT_CHARS update-index]} {[LIT_CHARS --refresh]}        )
        (AndOr OP_AND_IF
          (Com {[LIT_CHARS git]} {[LIT_CHARS diff]} {[LIT_CHARS --exit-code]}          )
          (If
            (Com {[LIT_CHARS test]} {[LIT_CHARS -n]} {[DQ [VarSub 3]]}            )
            (AndOr OP_AND_IF
              (Com {[LIT_CHARS git]} {[LIT_CHARS show]} {[LIT_CHARS -s]} {[LIT_CHARS --pretty] [LIT_DBRACKET_LIKE "="] [LIT_CHARS format] [LIT_OTHER ":"] [LIT_OTHER "%"] [LIT_CHARS s]} {[LIT_CHARS HEAD]}
                <
                (FilenameRedirectNode filename={[LIT_CHARS msg.act]} <REDIR_GREAT ">"> 1),
                >
              )
              (Com {[LIT_CHARS test_cmp]} {[DQ [VarSub 3]]} {[LIT_CHARS msg.act]}              )
            )
          )
        )
      )
    )
  )
  (FunctionDef verify_head []
    (AndOr OP_AND_IF
      (Com {[LIT_CHARS echo]} {[DQ [VarSub 1]]}
        <
        (FilenameRedirectNode filename={[LIT_CHARS head.expected]} <REDIR_GREAT ">"> 1),
        >
      )
      (AndOr OP_AND_IF
        (Com {[LIT_CHARS git]} {[LIT_CHARS rev-parse]} {[LIT_CHARS HEAD]}
          <
          (FilenameRedirectNode filename={[LIT_CHARS head.actual]} <REDIR_GREAT ">"> 1),
          >
        )
        (Com {[LIT_CHARS test_cmp]} {[LIT_CHARS head.expected]} {[LIT_CHARS head.actual]}        )
      )
    )
  )
  (FunctionDef verify_parents []
    (AndOr OP_AND_IF
      (Com {[LIT_CHARS printf]} {[SQ <LIT_CHARS "%s\\n">]} {[DQ [VarSub @]]}
        <
        (FilenameRedirectNode filename={[LIT_CHARS parents.expected]} <REDIR_GREAT ">"> 1),
        >
      )
      (AndOr OP_AND_IF
        (Com 
          <
          (FilenameRedirectNode filename={[LIT_CHARS parents.actual]} <REDIR_GREAT ">"> 1),
          >
        )
        (AndOr OP_AND_IF
          (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('i', {[LIT_CHARS 1]})])
          (AndOr OP_AND_IF
            (While
              (Com {[LIT_CHARS test]} {[VarSub i]} {[LIT_CHARS -le]} {[VarSub #]}              )
              (AndOr OP_AND_IF
                (Com {[LIT_CHARS git]} {[LIT_CHARS rev-parse]} {[LIT_CHARS HEAD] [LIT_OTHER "^"] [VarSub i]}
                  <
                  (FilenameRedirectNode filename={[LIT_CHARS parents.actual]} <REDIR_DGREAT ">>"> 1),
                  >
                )
                (AndOr OP_OR_IF
                  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('i', {[ComSub (Com {[LIT_CHARS expr]} {[VarSub i]} {[LIT_OTHER "+"]} {[LIT_CHARS 1]})]})])
                  (Com {[LIT_CHARS return]} {[LIT_CHARS 1]}                  )
                )
              )
            )
            (AndOr OP_AND_IF
              (Com {[LIT_CHARS test_must_fail]} {[LIT_CHARS git]} {[LIT_CHARS rev-parse]} {[LIT_CHARS --verify]} {[DQ [LIT_CHARS "HEAD^"][VarSub i]]}              )
              (Com {[LIT_CHARS test_cmp]} {[LIT_CHARS parents.expected]} {[LIT_CHARS parents.actual]}              )
            )
          )
        )
      )
    )
  )
  (FunctionDef verify_mergeheads []
    (AndOr OP_AND_IF
      (Com {[LIT_CHARS printf]} {[SQ <LIT_CHARS "%s\\n">]} {[DQ [VarSub @]]}
        <
        (FilenameRedirectNode filename={[LIT_CHARS mergehead.expected]} <REDIR_GREAT ">"> 1),
        >
      )
      (AndOr OP_AND_IF
        (While
          (Com {[LIT_CHARS read]} {[LIT_CHARS sha1]} {[LIT_CHARS rest]}          )
          (Com {[LIT_CHARS git]} {[LIT_CHARS rev-parse]} {[VarSub sha1]}          )
        )
        (Com {[LIT_CHARS test_cmp]} {[LIT_CHARS mergehead.expected]} {[LIT_CHARS mergehead.actual]}        )
      )
    )
  )
  (FunctionDef verify_no_mergehead []
    (Pipeline!
      (Com {[LIT_CHARS test]} {[LIT_CHARS -e]} {[LIT_CHARS .git/MERGE_HEAD]}      )
    )
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS setup>]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit add file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"commit 0\" &&\n"> <LIT_CHARS "\tgit tag c0 &&\n"> <LIT_CHARS "\tc0=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\tcp file.1 file &&\n"> <LIT_CHARS "\tgit add file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"commit 1\" &&\n"> <LIT_CHARS "\tgit tag c1 &&\n"> <LIT_CHARS "\tc1=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\tgit reset --hard \"$c0\" &&\n"> <LIT_CHARS "\tcp file.5 file &&\n"> <LIT_CHARS "\tgit add file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"commit 2\" &&\n"> <LIT_CHARS "\tgit tag c2 &&\n"> <LIT_CHARS "\tc2=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\tgit reset --hard \"$c0\" &&\n"> <LIT_CHARS "\tcp file.9 file &&\n"> <LIT_CHARS "\tgit add file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"commit 3\" &&\n"> <LIT_CHARS "\tgit tag c3 &&\n"> <LIT_CHARS "\tc3=$(git rev-parse HEAD)\n"> <LIT_CHARS "\tgit reset --hard \"$c0\" &&\n"> <LIT_CHARS "\tcreate_merge_msgs\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "test option parsing">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -$ c1 &&\n"> <LIT_CHARS "\ttest_must_fail git merge --no-such c1 &&\n"> <LIT_CHARS "\ttest_must_fail git merge -s foobar c1 &&\n"> <LIT_CHARS "\ttest_must_fail git merge -s=foobar c1 &&\n"> <LIT_CHARS "\ttest_must_fail git merge -m &&\n"> <LIT_CHARS "\ttest_must_fail git merge\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge -h with invalid index">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tmkdir broken &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd broken &&\n"> <LIT_CHARS "\t\tgit init &&\n"> <LIT_CHARS "\t\t>.git/index &&\n"> <LIT_CHARS "\t\ttest_expect_code 129 git merge -h 2>usage\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_i18ngrep \"[Uu]sage: git merge\" broken/usage\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "reject non-strategy with a git-merge-foo name">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge -s index c1\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c0 with c1">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\techo \"OBJID HEAD@{0}: merge c1: Fast-forward\" >reflog.expected &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit merge c1 &&\n"> <LIT_CHARS "\tverify_merge file result.1 &&\n"> <LIT_CHARS "\tverify_head \"$c1\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit reflog -1 >reflog.actual &&\n"> <LIT_CHARS "\tsed \"s/$_x05[0-9a-f]*/OBJID/g\" reflog.actual >reflog.fuzzy &&\n"> <LIT_CHARS "\ttest_cmp reflog.expected reflog.fuzzy\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c0 with c1 with --ff-only">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit merge --ff-only c1 &&\n"> <LIT_CHARS "\tgit merge --ff-only HEAD c0 c1 &&\n"> <LIT_CHARS "\tverify_merge file result.1 &&\n"> <LIT_CHARS "\tverify_head \"$c1\"\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge from unborn branch">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -f master &&\n"> <LIT_CHARS "\ttest_might_fail git branch -D kid &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\techo \"OBJID HEAD@{0}: initial pull\" >reflog.expected &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout --orphan kid &&\n"> <LIT_CHARS "\ttest_when_finished \"git checkout -f master\" &&\n"> <LIT_CHARS "\tgit rm -fr . &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit merge --ff-only c1 &&\n"> <LIT_CHARS "\tverify_merge file result.1 &&\n"> <LIT_CHARS "\tverify_head \"$c1\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit reflog -1 >reflog.actual &&\n"> <LIT_CHARS "\tsed \"s/$_x05[0-9a-f][0-9a-f]/OBJID/g\" reflog.actual >reflog.fuzzy &&\n"> <LIT_CHARS "\ttest_cmp reflog.expected reflog.fuzzy\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c1 with c2">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit merge c2 &&\n"> <LIT_CHARS "\tverify_merge file result.1-5 msg.1-5 &&\n"> <LIT_CHARS "\tverify_parents $c1 $c2\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c1 with c2 and c3">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit merge c2 c3 &&\n"> <LIT_CHARS "\tverify_merge file result.1-5-9 msg.1-5-9 &&\n"> <LIT_CHARS "\tverify_parents $c1 $c2 $c3\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merges with --ff-only">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\ttest_must_fail git merge --ff-only c2 &&\n"> <LIT_CHARS "\ttest_must_fail git merge --ff-only c3 &&\n"> <LIT_CHARS "\ttest_must_fail git merge --ff-only c2 c3 &&\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit merge c3 &&\n"> <LIT_CHARS "\tverify_head $c3\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merges with merge.ff=only">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\ttest_when_finished \"git config --unset merge.ff\" &&\n"> <LIT_CHARS "\tgit config merge.ff only &&\n"> <LIT_CHARS "\ttest_must_fail git merge c2 &&\n"> <LIT_CHARS "\ttest_must_fail git merge c3 &&\n"> <LIT_CHARS "\ttest_must_fail git merge c2 c3 &&\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit merge c3 &&\n"> <LIT_CHARS "\tverify_head $c3\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c0 with c1 (no-commit)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit merge --no-commit c1 &&\n"> <LIT_CHARS "\tverify_merge file result.1 &&\n"> <LIT_CHARS "\tverify_head $c1\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c1 with c2 (no-commit)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tgit merge --no-commit c2 &&\n"> <LIT_CHARS "\tverify_merge file result.1-5 &&\n"> <LIT_CHARS "\tverify_head $c1 &&\n"> <LIT_CHARS "\tverify_mergeheads $c2\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c1 with c2 and c3 (no-commit)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tgit merge --no-commit c2 c3 &&\n"> <LIT_CHARS "\tverify_merge file result.1-5-9 &&\n"> <LIT_CHARS "\tverify_head $c1 &&\n"> <LIT_CHARS "\tverify_mergeheads $c2 $c3\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c0 with c1 (squash)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit merge --squash c1 &&\n"> <LIT_CHARS "\tverify_merge file result.1 &&\n"> <LIT_CHARS "\tverify_head $c0 &&\n"> <LIT_CHARS "\tverify_no_mergehead &&\n"> <LIT_CHARS "\ttest_cmp squash.1 .git/SQUASH_MSG\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c0 with c1 (squash, ff-only)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit merge --squash --ff-only c1 &&\n"> <LIT_CHARS "\tverify_merge file result.1 &&\n"> <LIT_CHARS "\tverify_head $c0 &&\n"> <LIT_CHARS "\tverify_no_mergehead &&\n"> <LIT_CHARS "\ttest_cmp squash.1 .git/SQUASH_MSG\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c1 with c2 (squash)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tgit merge --squash c2 &&\n"> <LIT_CHARS "\tverify_merge file result.1-5 &&\n"> <LIT_CHARS "\tverify_head $c1 &&\n"> <LIT_CHARS "\tverify_no_mergehead &&\n"> <LIT_CHARS "\ttest_cmp squash.1-5 .git/SQUASH_MSG\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "unsuccesful merge of c1 with c2 (squash, ff-only)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\ttest_must_fail git merge --squash --ff-only c2\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c1 with c2 and c3 (squash)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tgit merge --squash c2 c3 &&\n"> <LIT_CHARS "\tverify_merge file result.1-5-9 &&\n"> <LIT_CHARS "\tverify_head $c1 &&\n"> <LIT_CHARS "\tverify_no_mergehead &&\n"> <LIT_CHARS "\ttest_cmp squash.1-5-9 .git/SQUASH_MSG\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c1 with c2 (no-commit in config)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tgit config branch.master.mergeoptions \"--no-commit\" &&\n"> <LIT_CHARS "\tgit merge c2 &&\n"> <LIT_CHARS "\tverify_merge file result.1-5 &&\n"> <LIT_CHARS "\tverify_head $c1 &&\n"> <LIT_CHARS "\tverify_mergeheads $c2\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c1 with c2 (log in config)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit config branch.master.mergeoptions \"\" &&\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tgit merge --log c2 &&\n"> <LIT_CHARS "\tgit show -s --pretty=tformat:%s%n%b >expect &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit config branch.master.mergeoptions --log &&\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tgit merge c2 &&\n"> <LIT_CHARS "\tgit show -s --pretty=tformat:%s%n%b >actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c1 with c2 (log in config gets overridden)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished \"git config --remove-section branch.master\" &&\n"> <LIT_CHARS "\ttest_when_finished \"git config --remove-section merge\" &&\n"> <LIT_CHARS "\ttest_might_fail git config --remove-section branch.master &&\n"> <LIT_CHARS "\ttest_might_fail git config --remove-section merge &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tgit merge c2 &&\n"> <LIT_CHARS "\tgit show -s --pretty=tformat:%s%n%b >expect &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit config branch.master.mergeoptions \"--no-log\" &&\n"> <LIT_CHARS "\tgit config merge.log true &&\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tgit merge c2 &&\n"> <LIT_CHARS "\tgit show -s --pretty=tformat:%s%n%b >actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c1 with c2 (squash in config)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tgit config branch.master.mergeoptions \"--squash\" &&\n"> <LIT_CHARS "\tgit merge c2 &&\n"> <LIT_CHARS "\tverify_merge file result.1-5 &&\n"> <LIT_CHARS "\tverify_head $c1 &&\n"> <LIT_CHARS "\tverify_no_mergehead &&\n"> <LIT_CHARS "\ttest_cmp squash.1-5 .git/SQUASH_MSG\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "override config option -n with --summary">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tgit config branch.master.mergeoptions \"-n\" &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit merge --summary c2 >diffstat.txt &&\n"> <LIT_CHARS "\tverify_merge file result.1-5 msg.1-5 &&\n"> <LIT_CHARS "\tverify_parents $c1 $c2 &&\n"> <LIT_CHARS "\tif ! grep \"^ file |  *2 +-$\" diffstat.txt\n"> <LIT_CHARS "\tthen\n"> <LIT_CHARS "\t\techo \"[OOPS] diffstat was not generated with --summary\"\n"> <LIT_CHARS "\t\tfalse\n"> <LIT_CHARS "\tfi\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "override config option -n with --stat">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tgit config branch.master.mergeoptions \"-n\" &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit merge --stat c2 >diffstat.txt &&\n"> <LIT_CHARS "\tverify_merge file result.1-5 msg.1-5 &&\n"> <LIT_CHARS "\tverify_parents $c1 $c2 &&\n"> <LIT_CHARS "\tif ! grep \"^ file |  *2 +-$\" diffstat.txt\n"> <LIT_CHARS "\tthen\n"> <LIT_CHARS "\t\techo \"[OOPS] diffstat was not generated with --stat\"\n"> <LIT_CHARS "\t\tfalse\n"> <LIT_CHARS "\tfi\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "override config option --stat">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tgit config branch.master.mergeoptions \"--stat\" &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit merge -n c2 >diffstat.txt &&\n"> <LIT_CHARS "\tverify_merge file result.1-5 msg.1-5 &&\n"> <LIT_CHARS "\tverify_parents $c1 $c2 &&\n"> <LIT_CHARS "\tif grep \"^ file |  *2 +-$\" diffstat.txt\n"> <LIT_CHARS "\tthen\n"> <LIT_CHARS "\t\techo \"[OOPS] diffstat was generated\"\n"> <LIT_CHARS "\t\tfalse\n"> <LIT_CHARS "\tfi\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c1 with c2 (override --no-commit)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tgit config branch.master.mergeoptions \"--no-commit\" &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit merge --commit c2 &&\n"> <LIT_CHARS "\tverify_merge file result.1-5 msg.1-5 &&\n"> <LIT_CHARS "\tverify_parents $c1 $c2\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c1 with c2 (override --squash)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tgit config branch.master.mergeoptions \"--squash\" &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit merge --no-squash c2 &&\n"> <LIT_CHARS "\tverify_merge file result.1-5 msg.1-5 &&\n"> <LIT_CHARS "\tverify_parents $c1 $c2\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c0 with c1 (no-ff)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit config branch.master.mergeoptions \"\" &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit merge --no-ff c1 &&\n"> <LIT_CHARS "\tverify_merge file result.1 &&\n"> <LIT_CHARS "\tverify_parents $c0 $c1\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c0 with c1 (merge.ff=false)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit config merge.ff false &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit merge c1 &&\n"> <LIT_CHARS "\tgit config --remove-section merge &&\n"> <LIT_CHARS "\tverify_merge file result.1 &&\n"> <LIT_CHARS "\tverify_parents $c0 $c1\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "combine branch.master.mergeoptions with merge.ff">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit config branch.master.mergeoptions --ff &&\n"> <LIT_CHARS "\tgit config merge.ff false &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit merge c1 &&\n"> <LIT_CHARS "\tgit config --remove-section \"branch.master\" &&\n"> <LIT_CHARS "\tgit config --remove-section \"merge\" &&\n"> <LIT_CHARS "\tverify_merge file result.1 &&\n"> <LIT_CHARS "\tverify_parents \"$c0\"\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "tolerate unknown values for merge.ff">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit config merge.ff something-new &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit merge c1 2>message &&\n"> <LIT_CHARS "\tgit config --remove-section \"merge\" &&\n"> <LIT_CHARS "\tverify_head \"$c1\" &&\n"> <LIT_CHARS "\ttest_cmp empty message\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "combining --squash and --no-ff is refused">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\ttest_must_fail git merge --squash --no-ff c1 &&\n"> <LIT_CHARS "\ttest_must_fail git merge --no-ff --squash c1\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "combining --ff-only and --no-ff is refused">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge --ff-only --no-ff c1 &&\n"> <LIT_CHARS "\ttest_must_fail git merge --no-ff --ff-only c1\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c0 with c1 (ff overrides no-ff)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit config branch.master.mergeoptions \"--no-ff\" &&\n"> <LIT_CHARS "\tgit merge --ff c1 &&\n"> <LIT_CHARS "\tverify_merge file result.1 &&\n"> <LIT_CHARS "\tverify_head $c1\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge log message">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit merge --no-log c2 &&\n"> <LIT_CHARS "\tgit show -s --pretty=format:%b HEAD >msg.act &&\n"> <LIT_CHARS "\ttest_cmp msg.nolog msg.act &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit merge --log c3 &&\n"> <LIT_CHARS "\tgit show -s --pretty=format:%b HEAD >msg.act &&\n"> <LIT_CHARS "\ttest_cmp msg.log msg.act &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard HEAD^ &&\n"> <LIT_CHARS "\tgit config merge.log yes &&\n"> <LIT_CHARS "\tgit merge c3 &&\n"> <LIT_CHARS "\tgit show -s --pretty=format:%b HEAD >msg.act &&\n"> <LIT_CHARS "\ttest_cmp msg.log msg.act\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c1 with c0, c2, c0, and c1">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "       git reset --hard c1 &&\n"> <LIT_CHARS "       git config branch.master.mergeoptions \"\" &&\n"> <LIT_CHARS "       test_tick &&\n"> <LIT_CHARS "       git merge c0 c2 c0 c1 &&\n"> <LIT_CHARS "       verify_merge file result.1-5 &&\n"> <LIT_CHARS "       verify_parents $c1 $c2\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c1 with c0, c2, c0, and c1">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "       git reset --hard c1 &&\n"> <LIT_CHARS "       git config branch.master.mergeoptions \"\" &&\n"> <LIT_CHARS "       test_tick &&\n"> <LIT_CHARS "       git merge c0 c2 c0 c1 &&\n"> <LIT_CHARS "       verify_merge file result.1-5 &&\n"> <LIT_CHARS "       verify_parents $c1 $c2\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge c1 with c1 and c2">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "       git reset --hard c1 &&\n"> <LIT_CHARS "       git config branch.master.mergeoptions \"\" &&\n"> <LIT_CHARS "       test_tick &&\n"> <LIT_CHARS "       git merge c1 c2 &&\n"> <LIT_CHARS "       verify_merge file result.1-5 &&\n"> <LIT_CHARS "       verify_parents $c1 $c2\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge fast-forward in a dirty tree">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "       git reset --hard c0 &&\n"> <LIT_CHARS "       mv file file1 &&\n"> <LIT_CHARS "       cat file1 >file &&\n"> <LIT_CHARS "       rm -f file1 &&\n"> <LIT_CHARS "       git merge c2\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "in-index merge">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit merge --no-ff -s resolve c1 >out &&\n"> <LIT_CHARS "\ttest_i18ngrep \"Wonderful.\" out &&\n"> <LIT_CHARS "\tverify_parents $c0 $c1\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "refresh the index before merging">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c1 &&\n"> <LIT_CHARS "\tcp file file.n && mv -f file.n file &&\n"> <LIT_CHARS "\tgit merge c3\n">]}  )
  (Com {[LIT_CHARS cat]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS expected.branch]} <REDIR_GREAT ">"> 1),
    (HereDocRedirectNode here_end='EOF' do_expansion=False body_word={[LIT_CHARS "Merge branch 'c5-branch' (early part)\n"]} <REDIR_DLESS "<<"> 0),
    >
  )
  (Com {[LIT_CHARS cat]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS expected.tag]} <REDIR_GREAT ">"> 1),
    (HereDocRedirectNode here_end='EOF' do_expansion=False body_word={[LIT_CHARS "Merge commit 'c5~1'\n"]} <REDIR_DLESS "<<"> 0),
    >
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge early part of c2">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c3 &&\n"> <LIT_CHARS "\techo c4 >c4.c &&\n"> <LIT_CHARS "\tgit add c4.c &&\n"> <LIT_CHARS "\tgit commit -m c4 &&\n"> <LIT_CHARS "\tgit tag c4 &&\n"> <LIT_CHARS "\techo c5 >c5.c &&\n"> <LIT_CHARS "\tgit add c5.c &&\n"> <LIT_CHARS "\tgit commit -m c5 &&\n"> <LIT_CHARS "\tgit tag c5 &&\n"> <LIT_CHARS "\tgit reset --hard c3 &&\n"> <LIT_CHARS "\techo c6 >c6.c &&\n"> <LIT_CHARS "\tgit add c6.c &&\n"> <LIT_CHARS "\tgit commit -m c6 &&\n"> <LIT_CHARS "\tgit tag c6 &&\n"> <LIT_CHARS "\tgit branch -f c5-branch c5 &&\n"> <LIT_CHARS "\tgit merge c5-branch~1 &&\n"> <LIT_CHARS "\tgit show -s --pretty=format:%s HEAD >actual.branch &&\n"> <LIT_CHARS "\tgit reset --keep HEAD^ &&\n"> <LIT_CHARS "\tgit merge c5~1 &&\n"> <LIT_CHARS "\tgit show -s --pretty=format:%s HEAD >actual.tag &&\n"> <LIT_CHARS "\ttest_cmp expected.branch actual.branch &&\n"> <LIT_CHARS "\ttest_cmp expected.tag actual.tag\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge --no-ff --no-commit && commit">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit merge --no-ff --no-commit c1 &&\n"> <LIT_CHARS "\tEDITOR=: git commit &&\n"> <LIT_CHARS "\tverify_parents $c0 $c1\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "amending no-ff merge commit">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tEDITOR=: git commit --amend &&\n"> <LIT_CHARS "\tverify_parents $c0 $c1\n">]}  )
  (Com {[LIT_CHARS test_debug]} {[SQ <LIT_CHARS "git log --graph --decorate --oneline --all">]}  )
  (Com {[LIT_CHARS cat]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS editor]} <REDIR_GREAT ">"> 1),
    (HereDocRedirectNode here_end='EOF' do_expansion=False body_word={[LIT_CHARS "#!/bin/sh\n"] [LIT_CHARS "# Add a new message string that was not in the template\n"] [LIT_CHARS "(\n"] [LIT_CHARS "\techo \"Merge work done on the side branch c1\"\n"] [LIT_CHARS "\techo\n"] [LIT_CHARS "\tcat <\"$1\"\n"] [LIT_CHARS ") >\"$1.tmp\" && mv \"$1.tmp\" \"$1\"\n"] [LIT_CHARS "# strip comments and blank lines from end of message\n"] [LIT_CHARS "sed -e '/^#/d' < \"$1\" | sed -e :a -e '/^\\n*$/{$d;N;ba' -e '}' > expected\n"]} <REDIR_DLESS "<<"> 0),
    >
  )
  (Com {[LIT_CHARS chmod]} {[LIT_CHARS 755]} {[LIT_CHARS editor]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge --no-ff --edit">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tEDITOR=./editor git merge --no-ff --edit c1 &&\n"> <LIT_CHARS "\tverify_parents $c0 $c1 &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD >raw &&\n"> <LIT_CHARS "\tgrep \"work done on the side branch\" raw &&\n"> <LIT_CHARS "\tsed \"1,/^$/d\" >actual raw &&\n"> <LIT_CHARS "\ttest_cmp actual expected\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS GPG]} {[SQ <LIT_CHARS "merge --ff-only tag">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit commit --allow-empty -m \"A newer commit\" &&\n"> <LIT_CHARS "\tgit tag -s -m \"A newer commit\" signed &&\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit merge --ff-only signed &&\n"> <LIT_CHARS "\tgit rev-parse signed^0 >expect &&\n"> <LIT_CHARS "\tgit rev-parse HEAD >actual &&\n"> <LIT_CHARS "\ttest_cmp actual expect\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS GPG]} {[SQ <LIT_CHARS "merge --no-edit tag should skip editor">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\tgit commit --allow-empty -m \"A newer commit\" &&\n"> <LIT_CHARS "\tgit tag -f -s -m \"A newer commit\" signed &&\n"> <LIT_CHARS "\tgit reset --hard c0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tEDITOR=false git merge --no-edit signed &&\n"> <LIT_CHARS "\tgit rev-parse signed^0 >expect &&\n"> <LIT_CHARS "\tgit rev-parse HEAD^2 >actual &&\n"> <LIT_CHARS "\ttest_cmp actual expect\n">]}  )
  (Com {[LIT_CHARS test_done]}  )
)