(List (= scope= flags=0 words=[] bindings=[('test_description', {[DQ [LIT_CHARS "git merge\n"][LIT_CHARS "\n"][LIT_CHARS "Testing a custom strategy.\n"][LIT_CHARS "\n"][LIT_CHARS "* (HEAD, master) Merge commit 'c3'\n"][LIT_CHARS "|"][LIT_CHARS "| * (tag: c3) c3\n"][LIT_CHARS "* | (tag: c1) c1\n"][LIT_CHARS "|/\n"][LIT_CHARS "| * tag: c2) c2\n"][LIT_CHARS "|/\n"][LIT_CHARS "* (tag: c0) c0\n"]]})]) (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ git-merge-theirs <<-EOF &&\n"> ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ c1.c &&\n"> ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ head.old &&\n"> second-parent.expected &&\n"> tree.expected &&\n"> head.new &&\n"> first-parent &&\n"> second-parent &&\n"> tree &&\n"> ]}) (Com {[LIT_CHARS test_expect_success]} {[SQ ]} {[SQ head.old &&\n"> second-parent.expected &&\n"> tree.expected &&\n"> head.new &&\n"> first-parent &&\n"> second-parent &&\n"> tree &&\n"> ]}) (Com {[LIT_CHARS test_done]}) )