(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "git mergetool\n"> <LIT_CHARS "\n"> <LIT_CHARS "Testing basic merge tool invocation">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS setup>]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "    git config rerere.enabled true &&\n"> <LIT_CHARS "    echo master >file1 &&\n"> <LIT_CHARS "    echo master spaced >\"spaced name\" &&\n"> <LIT_CHARS "    echo master file11 >file11 &&\n"> <LIT_CHARS "    echo master file12 >file12 &&\n"> <LIT_CHARS "    echo master file13 >file13 &&\n"> <LIT_CHARS "    echo master file14 >file14 &&\n"> <LIT_CHARS "    mkdir subdir &&\n"> <LIT_CHARS "    echo master sub >subdir/file3 &&\n"> <LIT_CHARS "    test_create_repo submod &&\n"> <LIT_CHARS "    (\n"> <LIT_CHARS "\tcd submod &&\n"> <LIT_CHARS "\t: >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit commit -m \"Add foo\"\n"> <LIT_CHARS "    ) &&\n"> <LIT_CHARS "    git submodule add git://example.com/submod submod &&\n"> <LIT_CHARS "    git add file1 \"spaced name\" file1[1-4] subdir/file3 .gitmodules submod &&\n"> <LIT_CHARS "    git commit -m \"add initial versions\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b branch1 master &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    echo branch1 change >file1 &&\n"> <LIT_CHARS "    echo branch1 newfile >file2 &&\n"> <LIT_CHARS "    echo branch1 spaced >\"spaced name\" &&\n"> <LIT_CHARS "    echo branch1 both added >both &&\n"> <LIT_CHARS "    echo branch1 change file11 >file11 &&\n"> <LIT_CHARS "    echo branch1 change file13 >file13 &&\n"> <LIT_CHARS "    echo branch1 sub >subdir/file3 &&\n"> <LIT_CHARS "    (\n"> <LIT_CHARS "\tcd submod &&\n"> <LIT_CHARS "\techo branch1 submodule >bar &&\n"> <LIT_CHARS "\tgit add bar &&\n"> <LIT_CHARS "\tgit commit -m \"Add bar on branch1\" &&\n"> <LIT_CHARS "\tgit checkout -b submod-branch1\n"> <LIT_CHARS "    ) &&\n"> <LIT_CHARS "    git add file1 \"spaced name\" file11 file13 file2 subdir/file3 submod &&\n"> <LIT_CHARS "    git add both &&\n"> <LIT_CHARS "    git rm file12 &&\n"> <LIT_CHARS "    git commit -m \"branch1 changes\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b stash1 master &&\n"> <LIT_CHARS "    echo stash1 change file11 >file11 &&\n"> <LIT_CHARS "    git add file11 &&\n"> <LIT_CHARS "    git commit -m \"stash1 changes\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b stash2 master &&\n"> <LIT_CHARS "    echo stash2 change file11 >file11 &&\n"> <LIT_CHARS "    git add file11 &&\n"> <LIT_CHARS "    git commit -m \"stash2 changes\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git checkout master &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    echo master updated >file1 &&\n"> <LIT_CHARS "    echo master new >file2 &&\n"> <LIT_CHARS "    echo master updated spaced >\"spaced name\" &&\n"> <LIT_CHARS "    echo master both added >both &&\n"> <LIT_CHARS "    echo master updated file12 >file12 &&\n"> <LIT_CHARS "    echo master updated file14 >file14 &&\n"> <LIT_CHARS "    echo master new sub >subdir/file3 &&\n"> <LIT_CHARS "    (\n"> <LIT_CHARS "\tcd submod &&\n"> <LIT_CHARS "\techo master submodule >bar &&\n"> <LIT_CHARS "\tgit add bar &&\n"> <LIT_CHARS "\tgit commit -m \"Add bar on master\" &&\n"> <LIT_CHARS "\tgit checkout -b submod-master\n"> <LIT_CHARS "    ) &&\n"> <LIT_CHARS "    git add file1 \"spaced name\" file12 file14 file2 subdir/file3 submod &&\n"> <LIT_CHARS "    git add both &&\n"> <LIT_CHARS "    git rm file11 &&\n"> <LIT_CHARS "    git commit -m \"master updates\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git config merge.tool mytool &&\n"> <LIT_CHARS "    git config mergetool.mytool.cmd \"cat \\\"\\$REMOTE\\\" >\\\"\\$MERGED\\\"\" &&\n"> <LIT_CHARS "    git config mergetool.mytool.trustExitCode true &&\n"> <LIT_CHARS "    git config mergetool.mybase.cmd \"cat \\\"\\$BASE\\\" >\\\"\\$MERGED\\\"\" &&\n"> <LIT_CHARS "    git config mergetool.mybase.trustExitCode true\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "custom mergetool">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b test1 branch1 &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test_must_fail git merge master >/dev/null 2>&1 &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool both >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool file1 file1 ) &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool file2 \"spaced name\" >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"d\" | git mergetool file11 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"d\" | git mergetool file12 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"l\" | git mergetool submod >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    test \"$(cat file1)\" = \"master updated\" &&\n"> <LIT_CHARS "    test \"$(cat file2)\" = \"master new\" &&\n"> <LIT_CHARS "    test \"$(cat subdir/file3)\" = \"master new sub\" &&\n"> <LIT_CHARS "    test \"$(cat submod/bar)\" = \"branch1 submodule\" &&\n"> <LIT_CHARS "    git commit -m \"branch1 resolved with mergetool\"\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "mergetool crlf">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "    git config core.autocrlf true &&\n"> <LIT_CHARS "    git checkout -b test2 branch1 &&\n"> <LIT_CHARS "    test_must_fail git merge master >/dev/null 2>&1 &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool file1 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool file2 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool \"spaced name\" >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool both >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"d\" | git mergetool file11 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"d\" | git mergetool file12 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"r\" | git mergetool submod >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    test \"$(printf x | cat file1 -)\" = \"$(printf \"master updated\\r\\nx\")\" &&\n"> <LIT_CHARS "    test \"$(printf x | cat file2 -)\" = \"$(printf \"master new\\r\\nx\")\" &&\n"> <LIT_CHARS "    test \"$(printf x | cat subdir/file3 -)\" = \"$(printf \"master new sub\\r\\nx\")\" &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test \"$(cat submod/bar)\" = \"master submodule\" &&\n"> <LIT_CHARS "    git commit -m \"branch1 resolved with mergetool - autocrlf\" &&\n"> <LIT_CHARS "    git config core.autocrlf false &&\n"> <LIT_CHARS "    git reset --hard\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "mergetool in subdir">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b test3 branch1 &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    (\n"> <LIT_CHARS "\tcd subdir &&\n"> <LIT_CHARS "\ttest_must_fail git merge master >/dev/null 2>&1 &&\n"> <LIT_CHARS "\t( yes \"\" | git mergetool file3 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "\ttest \"$(cat file3)\" = \"master new sub\"\n"> <LIT_CHARS "    )\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "mergetool on file in parent dir">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "    (\n"> <LIT_CHARS "\tcd subdir &&\n"> <LIT_CHARS "\t( yes \"\" | git mergetool ../file1 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "\t( yes \"\" | git mergetool ../file2 ../spaced\\ name >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "\t( yes \"\" | git mergetool ../both >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "\t( yes \"d\" | git mergetool ../file11 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "\t( yes \"d\" | git mergetool ../file12 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "\t( yes \"l\" | git mergetool ../submod >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "\ttest \"$(cat ../file1)\" = \"master updated\" &&\n"> <LIT_CHARS "\ttest \"$(cat ../file2)\" = \"master new\" &&\n"> <LIT_CHARS "\ttest \"$(cat ../submod/bar)\" = \"branch1 submodule\" &&\n"> <LIT_CHARS "\tgit commit -m \"branch1 resolved with mergetool - subdir\"\n"> <LIT_CHARS "    )\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "mergetool skips autoresolved">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b test4 branch1 &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test_must_fail git merge master &&\n"> <LIT_CHARS "    test -n \"$(git ls-files -u)\" &&\n"> <LIT_CHARS "    ( yes \"d\" | git mergetool file11 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"d\" | git mergetool file12 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"l\" | git mergetool submod >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    output=\"$(git mergetool --no-prompt)\" &&\n"> <LIT_CHARS "    test \"$output\" = \"No files need merging\" &&\n"> <LIT_CHARS "    git reset --hard\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "mergetool merges all from subdir">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "    (\n"> <LIT_CHARS "\tcd subdir &&\n"> <LIT_CHARS "\tgit config rerere.enabled false &&\n"> <LIT_CHARS "\ttest_must_fail git merge master &&\n"> <LIT_CHARS "\t( yes \"r\" | git mergetool ../submod ) &&\n"> <LIT_CHARS "\t( yes \"d\" \"d\" | git mergetool --no-prompt ) &&\n"> <LIT_CHARS "\ttest \"$(cat ../file1)\" = \"master updated\" &&\n"> <LIT_CHARS "\ttest \"$(cat ../file2)\" = \"master new\" &&\n"> <LIT_CHARS "\ttest \"$(cat file3)\" = \"master new sub\" &&\n"> <LIT_CHARS "\t( cd .. && git submodule update -N ) &&\n"> <LIT_CHARS "\ttest \"$(cat ../submod/bar)\" = \"master submodule\" &&\n"> <LIT_CHARS "\tgit commit -m \"branch2 resolved by mergetool from subdir\"\n"> <LIT_CHARS "    )\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "mergetool skips resolved paths when rerere is active">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "    git config rerere.enabled true &&\n"> <LIT_CHARS "    rm -rf .git/rr-cache &&\n"> <LIT_CHARS "    git checkout -b test5 branch1\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test_must_fail git merge master >/dev/null 2>&1 &&\n"> <LIT_CHARS "    ( yes \"l\" | git mergetool --no-prompt submod >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"d\" \"d\" | git mergetool --no-prompt >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    output=\"$(yes \"n\" | git mergetool --no-prompt)\" &&\n"> <LIT_CHARS "    test \"$output\" = \"No files need merging\" &&\n"> <LIT_CHARS "    git reset --hard\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "conflicted stash sets up rerere">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "    git config rerere.enabled true &&\n"> <LIT_CHARS "    git checkout stash1 &&\n"> <LIT_CHARS "    echo \"Conflicting stash content\" >file11 &&\n"> <LIT_CHARS "    git stash &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git checkout --detach stash2 &&\n"> <LIT_CHARS "    test_must_fail git stash apply &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    test -n \"$(git ls-files -u)\" &&\n"> <LIT_CHARS "    conflicts=\"$(git rerere remaining)\" &&\n"> <LIT_CHARS "    test \"$conflicts\" = \"file11\" &&\n"> <LIT_CHARS "    output=\"$(git mergetool --no-prompt)\" &&\n"> <LIT_CHARS "    test \"$output\" != \"No files need merging\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git commit -am \"save the stash resolution\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git reset --hard stash2 &&\n"> <LIT_CHARS "    test_must_fail git stash apply &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    test -n \"$(git ls-files -u)\" &&\n"> <LIT_CHARS "    conflicts=\"$(git rerere remaining)\" &&\n"> <LIT_CHARS "    test -z \"$conflicts\" &&\n"> <LIT_CHARS "    output=\"$(git mergetool --no-prompt)\" &&\n"> <LIT_CHARS "    test \"$output\" = \"No files need merging\"\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "mergetool takes partial path">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "    git reset --hard\n"> <LIT_CHARS "    git config rerere.enabled false &&\n"> <LIT_CHARS "    git checkout -b test12 branch1 &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test_must_fail git merge master &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    #shouldnt need these lines\n"> <LIT_CHARS "    #( yes \"d\" | git mergetool file11 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    #( yes \"d\" | git mergetool file12 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    #( yes \"l\" | git mergetool submod >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    #( yes \"\" | git mergetool file1 file2 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    ( yes \"\" | git mergetool subdir ) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    test \"$(cat subdir/file3)\" = \"master new sub\" &&\n"> <LIT_CHARS "    git reset --hard\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "deleted vs modified submodule">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b test6 branch1 &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    mv submod submod-movedaside &&\n"> <LIT_CHARS "    git rm submod &&\n"> <LIT_CHARS "    git commit -m \"Submodule deleted from branch\" &&\n"> <LIT_CHARS "    git checkout -b test6.a test6 &&\n"> <LIT_CHARS "    test_must_fail git merge master &&\n"> <LIT_CHARS "    test -n \"$(git ls-files -u)\" &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool file1 file2 spaced\\ name subdir/file3 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool both >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"d\" | git mergetool file11 file12 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"r\" | git mergetool submod ) &&\n"> <LIT_CHARS "    rmdir submod && mv submod-movedaside submod &&\n"> <LIT_CHARS "    test \"$(cat submod/bar)\" = \"branch1 submodule\" &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test \"$(cat submod/bar)\" = \"master submodule\" &&\n"> <LIT_CHARS "    output=\"$(git mergetool --no-prompt)\" &&\n"> <LIT_CHARS "    test \"$output\" = \"No files need merging\" &&\n"> <LIT_CHARS "    git commit -m \"Merge resolved by keeping module\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    mv submod submod-movedaside &&\n"> <LIT_CHARS "    git checkout -b test6.b test6 &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test_must_fail git merge master &&\n"> <LIT_CHARS "    test -n \"$(git ls-files -u)\" &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool file1 file2 spaced\\ name subdir/file3 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool both >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"d\" | git mergetool file11 file12 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"l\" | git mergetool submod ) &&\n"> <LIT_CHARS "    test ! -e submod &&\n"> <LIT_CHARS "    output=\"$(git mergetool --no-prompt)\" &&\n"> <LIT_CHARS "    test \"$output\" = \"No files need merging\" &&\n"> <LIT_CHARS "    git commit -m \"Merge resolved by deleting module\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    mv submod-movedaside submod &&\n"> <LIT_CHARS "    git checkout -b test6.c master &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test_must_fail git merge test6 &&\n"> <LIT_CHARS "    test -n \"$(git ls-files -u)\" &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool file1 file2 spaced\\ name subdir/file3 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool both >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"d\" | git mergetool file11 file12 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"r\" | git mergetool submod ) &&\n"> <LIT_CHARS "    test ! -e submod &&\n"> <LIT_CHARS "    test -d submod.orig &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    output=\"$(git mergetool --no-prompt)\" &&\n"> <LIT_CHARS "    test \"$output\" = \"No files need merging\" &&\n"> <LIT_CHARS "    git commit -m \"Merge resolved by deleting module\" &&\n"> <LIT_CHARS "    mv submod.orig submod &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b test6.d master &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test_must_fail git merge test6 &&\n"> <LIT_CHARS "    test -n \"$(git ls-files -u)\" &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool file1 file2 spaced\\ name subdir/file3 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool both >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"d\" | git mergetool file11 file12 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"l\" | git mergetool submod ) &&\n"> <LIT_CHARS "    test \"$(cat submod/bar)\" = \"master submodule\" &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test \"$(cat submod/bar)\" = \"master submodule\" &&\n"> <LIT_CHARS "    output=\"$(git mergetool --no-prompt)\" &&\n"> <LIT_CHARS "    test \"$output\" = \"No files need merging\" &&\n"> <LIT_CHARS "    git commit -m \"Merge resolved by keeping module\" &&\n"> <LIT_CHARS "    git reset --hard HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "file vs modified submodule">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b test7 branch1 &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    mv submod submod-movedaside &&\n"> <LIT_CHARS "    git rm submod &&\n"> <LIT_CHARS "    echo not a submodule >submod &&\n"> <LIT_CHARS "    git add submod &&\n"> <LIT_CHARS "    git commit -m \"Submodule path becomes file\" &&\n"> <LIT_CHARS "    git checkout -b test7.a branch1 &&\n"> <LIT_CHARS "    test_must_fail git merge master &&\n"> <LIT_CHARS "    test -n \"$(git ls-files -u)\" &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool file1 file2 spaced\\ name subdir/file3 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool both >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"d\" | git mergetool file11 file12 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"r\" | git mergetool submod ) &&\n"> <LIT_CHARS "    rmdir submod && mv submod-movedaside submod &&\n"> <LIT_CHARS "    test \"$(cat submod/bar)\" = \"branch1 submodule\" &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test \"$(cat submod/bar)\" = \"master submodule\" &&\n"> <LIT_CHARS "    output=\"$(git mergetool --no-prompt)\" &&\n"> <LIT_CHARS "    test \"$output\" = \"No files need merging\" &&\n"> <LIT_CHARS "    git commit -m \"Merge resolved by keeping module\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    mv submod submod-movedaside &&\n"> <LIT_CHARS "    git checkout -b test7.b test7 &&\n"> <LIT_CHARS "    test_must_fail git merge master &&\n"> <LIT_CHARS "    test -n \"$(git ls-files -u)\" &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool file1 file2 spaced\\ name subdir/file3 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool both >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"d\" | git mergetool file11 file12 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"l\" | git mergetool submod ) &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test \"$(cat submod)\" = \"not a submodule\" &&\n"> <LIT_CHARS "    output=\"$(git mergetool --no-prompt)\" &&\n"> <LIT_CHARS "    test \"$output\" = \"No files need merging\" &&\n"> <LIT_CHARS "    git commit -m \"Merge resolved by keeping file\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b test7.c master &&\n"> <LIT_CHARS "    rmdir submod && mv submod-movedaside submod &&\n"> <LIT_CHARS "    test ! -e submod.orig &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test_must_fail git merge test7 &&\n"> <LIT_CHARS "    test -n \"$(git ls-files -u)\" &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool file1 file2 spaced\\ name subdir/file3 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool both >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"d\" | git mergetool file11 file12 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"r\" | git mergetool submod ) &&\n"> <LIT_CHARS "    test -d submod.orig &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test \"$(cat submod)\" = \"not a submodule\" &&\n"> <LIT_CHARS "    output=\"$(git mergetool --no-prompt)\" &&\n"> <LIT_CHARS "    test \"$output\" = \"No files need merging\" &&\n"> <LIT_CHARS "    git commit -m \"Merge resolved by keeping file\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b test7.d master &&\n"> <LIT_CHARS "    rmdir submod && mv submod.orig submod &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test_must_fail git merge test7 &&\n"> <LIT_CHARS "    test -n \"$(git ls-files -u)\" &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool file1 file2 spaced\\ name subdir/file3 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"\" | git mergetool both>/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"d\" | git mergetool file11 file12 >/dev/null 2>&1 ) &&\n"> <LIT_CHARS "    ( yes \"l\" | git mergetool submod ) &&\n"> <LIT_CHARS "    test \"$(cat submod/bar)\" = \"master submodule\" &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test \"$(cat submod/bar)\" = \"master submodule\" &&\n"> <LIT_CHARS "    output=\"$(git mergetool --no-prompt)\" &&\n"> <LIT_CHARS "    test \"$output\" = \"No files need merging\" &&\n"> <LIT_CHARS "    git commit -m \"Merge resolved by keeping module\"\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "submodule in subdirectory">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b test10 branch1 &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    (\n"> <LIT_CHARS "\tcd subdir &&\n"> <LIT_CHARS "\ttest_create_repo subdir_module &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t    cd subdir_module &&\n"> <LIT_CHARS "\t    : >file15 &&\n"> <LIT_CHARS "\t    git add file15 &&\n"> <LIT_CHARS "\t    git commit -m \"add initial versions\"\n"> <LIT_CHARS "\t)\n"> <LIT_CHARS "    ) &&\n"> <LIT_CHARS "    git submodule add git://example.com/subsubmodule subdir/subdir_module &&\n"> <LIT_CHARS "    git add subdir/subdir_module &&\n"> <LIT_CHARS "    git commit -m \"add submodule in subdirectory\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b test10.a test10 &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    (\n"> <LIT_CHARS "\tcd subdir/subdir_module &&\n"> <LIT_CHARS "\tgit checkout -b super10.a &&\n"> <LIT_CHARS "\techo test10.a >file15 &&\n"> <LIT_CHARS "\tgit add file15 &&\n"> <LIT_CHARS "\tgit commit -m \"on branch 10.a\"\n"> <LIT_CHARS "    ) &&\n"> <LIT_CHARS "    git add subdir/subdir_module &&\n"> <LIT_CHARS "    git commit -m \"change submodule in subdirectory on test10.a\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b test10.b test10 &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    (\n"> <LIT_CHARS "\tcd subdir/subdir_module &&\n"> <LIT_CHARS "\tgit checkout -b super10.b &&\n"> <LIT_CHARS "\techo test10.b >file15 &&\n"> <LIT_CHARS "\tgit add file15 &&\n"> <LIT_CHARS "\tgit commit -m \"on branch 10.b\"\n"> <LIT_CHARS "    ) &&\n"> <LIT_CHARS "    git add subdir/subdir_module &&\n"> <LIT_CHARS "    git commit -m \"change submodule in subdirectory on test10.b\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    test_must_fail git merge test10.a >/dev/null 2>&1 &&\n"> <LIT_CHARS "    (\n"> <LIT_CHARS "\tcd subdir &&\n"> <LIT_CHARS "\t( yes \"l\" | git mergetool subdir_module )\n"> <LIT_CHARS "    ) &&\n"> <LIT_CHARS "    test \"$(cat subdir/subdir_module/file15)\" = \"test10.b\" &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test \"$(cat subdir/subdir_module/file15)\" = \"test10.b\" &&\n"> <LIT_CHARS "    git reset --hard &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    test_must_fail git merge test10.a >/dev/null 2>&1 &&\n"> <LIT_CHARS "    ( yes \"r\" | git mergetool subdir/subdir_module ) &&\n"> <LIT_CHARS "    test \"$(cat subdir/subdir_module/file15)\" = \"test10.b\" &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test \"$(cat subdir/subdir_module/file15)\" = \"test10.a\" &&\n"> <LIT_CHARS "    git commit -m \"branch1 resolved with mergetool\" &&\n"> <LIT_CHARS "    rm -rf subdir/subdir_module\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "directory vs modified submodule">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b test11 branch1 &&\n"> <LIT_CHARS "    mv submod submod-movedaside &&\n"> <LIT_CHARS "    git rm submod &&\n"> <LIT_CHARS "    mkdir submod &&\n"> <LIT_CHARS "    echo not a submodule >submod/file16 &&\n"> <LIT_CHARS "    git add submod/file16 &&\n"> <LIT_CHARS "    git commit -m \"Submodule path becomes directory\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    test_must_fail git merge master &&\n"> <LIT_CHARS "    test -n \"$(git ls-files -u)\" &&\n"> <LIT_CHARS "    ( yes \"l\" | git mergetool submod ) &&\n"> <LIT_CHARS "    test \"$(cat submod/file16)\" = \"not a submodule\" &&\n"> <LIT_CHARS "    rm -rf submod.orig &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git reset --hard >/dev/null 2>&1 &&\n"> <LIT_CHARS "    test_must_fail git merge master &&\n"> <LIT_CHARS "    test -n \"$(git ls-files -u)\" &&\n"> <LIT_CHARS "    test ! -e submod.orig &&\n"> <LIT_CHARS "    ( yes \"r\" | git mergetool submod ) &&\n"> <LIT_CHARS "    test -d submod.orig &&\n"> <LIT_CHARS "    test \"$(cat submod.orig/file16)\" = \"not a submodule\" &&\n"> <LIT_CHARS "    rm -r submod.orig &&\n"> <LIT_CHARS "    mv submod-movedaside/.git submod &&\n"> <LIT_CHARS "    ( cd submod && git clean -f && git reset --hard ) &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test \"$(cat submod/bar)\" = \"master submodule\" &&\n"> <LIT_CHARS "    git reset --hard >/dev/null 2>&1 && rm -rf submod-movedaside &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b test11.c master &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test_must_fail git merge test11 &&\n"> <LIT_CHARS "    test -n \"$(git ls-files -u)\" &&\n"> <LIT_CHARS "    ( yes \"l\" | git mergetool submod ) &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test \"$(cat submod/bar)\" = \"master submodule\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git reset --hard >/dev/null 2>&1 &&\n"> <LIT_CHARS "    git submodule update -N &&\n"> <LIT_CHARS "    test_must_fail git merge test11 &&\n"> <LIT_CHARS "    test -n \"$(git ls-files -u)\" &&\n"> <LIT_CHARS "    test ! -e submod.orig &&\n"> <LIT_CHARS "    ( yes \"r\" | git mergetool submod ) &&\n"> <LIT_CHARS "    test \"$(cat submod/file16)\" = \"not a submodule\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "    git reset --hard master >/dev/null 2>&1 &&\n"> <LIT_CHARS "    ( cd submod && git clean -f && git reset --hard ) &&\n"> <LIT_CHARS "    git submodule update -N\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "file with no base">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "    git checkout -b test13 branch1 &&\n"> <LIT_CHARS "    test_must_fail git merge master &&\n"> <LIT_CHARS "    git mergetool --no-prompt --tool mybase -- both &&\n"> <LIT_CHARS "    >expected &&\n"> <LIT_CHARS "    test_cmp both expected &&\n"> <LIT_CHARS "    git reset --hard master >/dev/null 2>&1\n">]}  )
  (Com {[LIT_CHARS test_done]}  )
)