Merge branch 'ph/mergetool'
[git/git-p4.git] / t / 
treecfbac1411c7e4d5a98c808b3a5e72630b15e19b7
drwxr-xr-x   ..
-rw-r--r-- 36 .gitattributes
-rw-r--r-- 31 .gitignore
-rw-r--r-- 818 Makefile
-rw-r--r-- 7989 README
-rwxr-xr-x 593 aggregate-results.sh
-rw-r--r-- 3346 annotate-tests.sh
-rw-r--r-- 1437 diff-lib.sh
-rw-r--r-- 2797 lib-git-svn.sh
-rw-r--r-- 2057 lib-httpd.sh
drwxr-xr-x - lib-httpd
-rw-r--r-- 4207 lib-read-tree-m-3way.sh
-rwxr-xr-x 11963 t0000-basic.sh
-rwxr-xr-x 2727 t0001-init.sh
-rwxr-xr-x 1948 t0002-gitfile.sh
-rwxr-xr-x 1497 t0003-attributes.sh
-rwxr-xr-x 1019 t0004-unwritable.sh
-rwxr-xr-x 609 t0010-racy-git.sh
-rwxr-xr-x 8835 t0020-crlf.sh
-rwxr-xr-x 2326 t0021-conversion.sh
-rwxr-xr-x 560 t0022-crlf-rename.sh
-rwxr-xr-x 785 t0023-crlf-am.sh
-rwxr-xr-x 12799 t0030-stripspace.sh
-rwxr-xr-x 4736 t0040-parse-options.sh
-rwxr-xr-x 2352 t0050-filesystem.sh
-rwxr-xr-x 16996 t1000-read-tree-m-3way.sh
-rwxr-xr-x 10509 t1001-read-tree-m-2way.sh
-rwxr-xr-x 11228 t1002-read-tree-m-u-2way.sh
-rwxr-xr-x 412 t1003-read-tree-prefix.sh
-rwxr-xr-x 5561 t1004-read-tree-m-u-wf.sh
-rwxr-xr-x 499 t1005-read-tree-reset.sh
-rwxr-xr-x 6324 t1006-cat-file.sh
-rwxr-xr-x 2872 t1007-hash-object.sh
-rwxr-xr-x 2993 t1020-subdirectory.sh
-rwxr-xr-x 1104 t1100-commit-tree-options.sh
-rwxr-xr-x 4096 t1200-tutorial.sh
-rwxr-xr-x 14821 t1300-repo-config.sh
-rwxr-xr-x 1919 t1301-shared-repo.sh
-rwxr-xr-x 1228 t1302-repo-version.sh
-rwxr-xr-x 818 t1303-wacky-config.sh
-rwxr-xr-x 8407 t1400-update-ref.sh
-rwxr-xr-x 3738 t1410-reflog.sh
-rwxr-xr-x 749 t1420-lost-found.sh
-rwxr-xr-x 2016 t1500-rev-parse.sh
-rwxr-xr-x 3263 t1501-worktree.sh
-rwxr-xr-x 986 t1502-rev-parse-parseopt.sh
-rwxr-xr-x 3384 t1503-rev-parse-verify.sh
-rwxr-xr-x 1226 t2000-checkout-cache-clash.sh
-rwxr-xr-x 2486 t2001-checkout-cache-clash.sh
-rwxr-xr-x 741 t2002-checkout-cache-u.sh
-rwxr-xr-x 2579 t2003-checkout-cache-mkdir.sh
-rwxr-xr-x 5661 t2004-checkout-cache-temp.sh
-rwxr-xr-x 681 t2005-checkout-index-symlinks.sh
-rwxr-xr-x 866 t2007-checkout-symlink.sh
-rwxr-xr-x 1913 t2008-checkout-subdir.sh
-rwxr-xr-x 921 t2009-checkout-statinfo.sh
-rwxr-xr-x 1335 t2050-git-dir-relative.sh
-rwxr-xr-x 1055 t2100-update-cache-badpath.sh
-rwxr-xr-x 2195 t2101-update-index-reupdate.sh
-rwxr-xr-x 804 t2102-update-index-symlinks.sh
-rwxr-xr-x 2549 t2200-add-update.sh
-rwxr-xr-x 2831 t2201-add-update-typechange.sh
-rwxr-xr-x 1164 t3000-ls-files-others.sh
-rwxr-xr-x 2295 t3001-ls-files-others-exclude.sh
-rwxr-xr-x 1217 t3002-ls-files-dashpath.sh
-rwxr-xr-x 2090 t3010-ls-files-killed-modified.sh
-rwxr-xr-x 652 t3020-ls-files-error-unmatch.sh
-rwxr-xr-x 10328 t3030-merge-recursive.sh
-rwxr-xr-x 2498 t3040-subprojects-basic.sh
-rwxr-xr-x 1036 t3050-subprojects-fetch.sh
-rwxr-xr-x 1594 t3060-ls-files-with-tree.sh
-rwxr-xr-x 3695 t3100-ls-tree-restrict.sh
-rwxr-xr-x 3754 t3101-ls-tree-dirname.sh
-rwxr-xr-x 18154 t3200-branch.sh
-rwxr-xr-x 1507 t3201-branch-contains.sh
-rwxr-xr-x 2768 t3210-pack-refs.sh
-rwxr-xr-x 4258 t3300-funny-names.sh
-rwxr-xr-x 2322 t3400-rebase.sh
-rwxr-xr-x 1575 t3401-rebase-partial.sh
-rwxr-xr-x 2289 t3402-rebase-merge.sh
-rwxr-xr-x 1729 t3403-rebase-skip.sh
-rwxr-xr-x 9908 t3404-rebase-interactive.sh
-rwxr-xr-x 844 t3405-rebase-malformed.sh
-rwxr-xr-x 652 t3406-rebase-message.sh
-rwxr-xr-x 1939 t3407-rebase-abort.sh
-rwxr-xr-x 720 t3408-rebase-multi-line.sh
-rwxr-xr-x 1511 t3500-cherry.sh
-rwxr-xr-x 1263 t3501-revert-cherry-pick.sh
-rwxr-xr-x 2035 t3502-cherry-pick-merge.sh
-rwxr-xr-x 5830 t3600-rm.sh
-rwxr-xr-x 5789 t3700-add.sh
-rwxr-xr-x 2133 t3701-add-interactive.sh
-rwxr-xr-x 7906 t3800-mktag.sh
-rwxr-xr-x 2574 t3900-i18n-commit.sh
drwxr-xr-x - t3900
-rwxr-xr-x 153 t3901-8859-1.txt
-rwxr-xr-x 6286 t3901-i18n-patch.sh
-rwxr-xr-x 155 t3901-utf8.txt
-rwxr-xr-x 2585 t3902-quoted.sh
-rwxr-xr-x 2491 t3903-stash.sh
-rwxr-xr-x 1052 t4000-diff-format.sh
-rwxr-xr-x 1491 t4001-diff-rename.sh
-rwxr-xr-x 14812 t4002-diff-basic.sh
-rwxr-xr-x 4122 t4003-diff-rename-1.sh
-rwxr-xr-x 1570 t4004-diff-rename-symlink.sh
-rwxr-xr-x 2892 t4005-diff-rename-2.sh
-rwxr-xr-x 1001 t4006-diff-mode.sh
-rwxr-xr-x 2783 t4007-rename-3.sh
-rwxr-xr-x 6149 t4008-diff-break-rewrite.sh
-rwxr-xr-x 2910 t4009-diff-rename-4.sh
-rwxr-xr-x 1797 t4010-diff-pathspec.sh
-rwxr-xr-x 1713 t4011-diff-symlink.sh
-rwxr-xr-x 2229 t4012-diff-binary.sh
-rwxr-xr-x 7526 t4013-diff-various.sh
drwxr-xr-x - t4013
-rwxr-xr-x 6945 t4014-format-patch.sh
-rwxr-xr-x 6588 t4015-diff-whitespace.sh
-rwxr-xr-x 1844 t4016-diff-quote.sh
-rwxr-xr-x 2807 t4017-diff-retval.sh
-rwxr-xr-x 2198 t4017-quiet.sh
-rwxr-xr-x 1302 t4018-diff-funcname.sh
-rwxr-xr-x 3702 t4019-diff-wserror.sh
-rwxr-xr-x 2278 t4020-diff-external.sh
drwxr-xr-x - t4020
-rwxr-xr-x 1848 t4021-format-patch-numbered.sh
-rwxr-xr-x 935 t4021-format-patch-signer-mime.sh
-rwxr-xr-x 477 t4022-diff-rewrite.sh
-rwxr-xr-x 1568 t4023-diff-rename-typechange.sh
-rwxr-xr-x 2774 t4024-diff-optimize-common.sh
-rwxr-xr-x 665 t4025-hunk-header.sh
-rwxr-xr-x 1239 t4026-color.sh
-rwxr-xr-x 1102 t4027-diff-submodule.sh
-rwxr-xr-x 727 t4028-format-patch-mime-headers.sh
-rwxr-xr-x 737 t4100-apply-stat.sh
drwxr-xr-x - t4100
-rwxr-xr-x 548 t4101-apply-nonl.sh
drwxr-xr-x - t4101
-rwxr-xr-x 1158 t4102-apply-rename.sh
-rwxr-xr-x 3080 t4103-apply-binary.sh
-rwxr-xr-x 2504 t4104-apply-boundary.sh
-rwxr-xr-x 1147 t4105-apply-fuzz.sh
-rwxr-xr-x 1146 t4109-apply-multifrag.sh
drwxr-xr-x - t4109
-rwxr-xr-x 1360 t4110-apply-scan.sh
-rwxr-xr-x 2816 t4112-apply-renames.sh
-rwxr-xr-x 665 t4113-apply-ending.sh
-rwxr-xr-x 2552 t4114-apply-typechange.sh
-rwxr-xr-x 773 t4115-apply-symlink.sh
-rwxr-xr-x 1768 t4116-apply-reverse.sh
-rwxr-xr-x 2595 t4117-apply-reject.sh
-rwxr-xr-x 976 t4118-apply-empty-context.sh
-rwxr-xr-x 3095 t4119-apply-config.sh
-rwxr-xr-x 386 t4120-apply-popt.sh
-rwxr-xr-x 556 t4121-apply-diffs.sh
-rwxr-xr-x 1011 t4122-apply-symlink-inside.sh
-rwxr-xr-x 617 t4123-apply-shrink.sh
-rwxr-xr-x 3189 t4124-apply-ws-rule.sh
-rwxr-xr-x 2273 t4125-apply-ws-fuzz.sh
-rwxr-xr-x 1036 t4126-apply-empty.sh
-rwxr-xr-x 1973 t4127-apply-same-fn.sh
-rwxr-xr-x 7215 t4150-am.sh
-rwxr-xr-x 4973 t4200-rerere.sh
-rwxr-xr-x 1671 t4201-shortlog.sh
-rwxr-xr-x 1143 t4202-log.sh
-rwxr-xr-x 5370 t5000-tar-tree.sh
-rwxr-xr-x 988 t5100-mailinfo.sh
drwxr-xr-x - t5100
-rwxr-xr-x 9784 t5300-pack-object.sh
-rwxr-xr-x 1775 t5301-sliding-window.sh
-rwxr-xr-x 6429 t5302-pack-index.sh
-rwxr-xr-x 6865 t5303-pack-corruption-resilience.sh
-rw-r--r-- 2666 t5304-prune.sh
-rwxr-xr-x 1867 t5305-include-tag.sh
-rwxr-xr-x 4201 t5400-send-pack.sh
-rwxr-xr-x 3673 t5401-update-hooks.sh
-rwxr-xr-x 1546 t5402-post-merge-hook.sh
-rwxr-xr-x 2606 t5403-post-checkout-hook.sh
-rwxr-xr-x 1277 t5404-tracking-branches.sh
-rwxr-xr-x 593 t5405-send-pack-rewind.sh
-rwxr-xr-x 509 t5406-remote-rejects.sh
-rwxr-xr-x 4153 t5500-fetch-pack.sh
-rwxr-xr-x 2133 t5502-quickfetch.sh
-rwxr-xr-x 2926 t5503-tagfollow.sh
-rwxr-xr-x 7066 t5505-remote.sh
-rwxr-xr-x 6736 t5510-fetch.sh
-rwxr-xr-x 2493 t5511-refspec.sh
-rwxr-xr-x 827 t5512-ls-remote.sh
-rwxr-xr-x 4593 t5515-fetch-merge-logic.sh
drwxr-xr-x - t5515
-rwxr-xr-x 10465 t5516-fetch-push.sh
-rwxr-xr-x 6383 t5517-push-mirror.sh
-rwxr-xr-x 508 t5518-fetch-exit-status.sh
-rwxr-xr-x 2597 t5520-pull.sh
-rwxr-xr-x 1307 t5530-upload-pack-error.sh
-rwxr-xr-x 1367 t5540-http-push.sh
-rwxr-xr-x 1127 t5600-clone-fail-cleanup.sh
-rwxr-xr-x 858 t5601-clone.sh
-rwxr-xr-x 3160 t5700-clone-reference.sh
-rwxr-xr-x 2399 t5701-clone-local.sh
-rwxr-xr-x 351 t5702-clone-options.sh
-rwxr-xr-x 2320 t5710-info-alternate.sh
-rwxr-xr-x 2647 t6000lib.sh
-rwxr-xr-x 2358 t6001-rev-list-graft.sh
-rwxr-xr-x 8367 t6002-rev-list-bisect.sh
-rwxr-xr-x 8715 t6003-rev-list-topo-order.sh
-rwxr-xr-x 1275 t6004-rev-list-path-optim.sh
-rwxr-xr-x 1693 t6005-rev-list-count.sh
-rwxr-xr-x 3897 t6006-rev-list-format.sh
-rwxr-xr-x 1271 t6007-rev-list-cherry-pick-file.sh
-rwxr-xr-x 805 t6008-rev-list-submodule.sh
-rwxr-xr-x 531 t6009-rev-list-parent.sh
-rwxr-xr-x 2560 t6010-merge-base.sh
-rwxr-xr-x 528 t6020-merge-df.sh
-rwxr-xr-x 1230 t6021-merge-criss-cross.sh
-rwxr-xr-x 8140 t6022-merge-rename.sh
-rwxr-xr-x 4350 t6023-merge-file.sh
-rwxr-xr-x 3713 t6023-merge-rename-nocruft.sh
-rwxr-xr-x 2361 t6024-recursive-merge.sh
-rwxr-xr-x 1515 t6025-merge-symlinks.sh
-rwxr-xr-x 2783 t6026-merge-attr.sh
-rwxr-xr-x 1132 t6027-merge-binary.sh
-rwxr-xr-x 1415 t6028-merge-up-to-date.sh
-rwxr-xr-x 1697 t6029-merge-subtree.sh
-rwxr-xr-x 10533 t6030-bisect-porcelain.sh
-rwxr-xr-x 1176 t6031-merge-recursive.sh
-rwxr-xr-x 1274 t6032-merge-large-rename.sh
-rwxr-xr-x 1001 t6033-merge-crlf.sh
-rwxr-xr-x 1887 t6101-rev-parse-parents.sh
-rwxr-xr-x 3025 t6120-describe.sh
-rwxr-xr-x 3648 t6200-fmt-merge-msg.sh
-rwxr-xr-x 8609 t6300-for-each-ref.sh
-rwxr-xr-x 3690 t7001-mv.sh
-rwxr-xr-x 2086 t7002-grep.sh
-rwxr-xr-x 6205 t7003-filter-branch.sh
-rwxr-xr-x 29537 t7004-tag.sh
drwxr-xr-x - t7004
-rwxr-xr-x 2196 t7005-editor.sh
-rwxr-xr-x 2781 t7010-setup.sh
-rwxr-xr-x 1467 t7101-reset.sh
-rwxr-xr-x 11068 t7102-reset.sh
-rwxr-xr-x 525 t7103-reset-bare.sh
-rwxr-xr-x 825 t7104-reset.sh
-rwxr-xr-x 7383 t7201-co.sh
-rwxr-xr-x 7828 t7300-clean.sh
-rwxr-xr-x 5001 t7400-submodule-basic.sh
-rwxr-xr-x 3749 t7401-submodule-summary.sh
-rwxr-xr-x 2064 t7402-submodule-rebase.sh
-rwxr-xr-x 3779 t7500-commit.sh
drwxr-xr-x - t7500
-rwxr-xr-x 7833 t7501-commit.sh
-rwxr-xr-x 5818 t7502-commit.sh
-rwxr-xr-x 7642 t7502-status.sh
-rwxr-xr-x 1370 t7503-pre-commit-hook.sh
-rwxr-xr-x 4244 t7504-commit-msg-hook.sh
-rwxr-xr-x 3228 t7505-prepare-commit-msg-hook.sh
-rwxr-xr-x 710 t7506-status-submodule.sh
-rwxr-xr-x 8670 t7600-merge.sh
-rw-r--r-- 1283 t7610-mergetool.sh
-rwxr-xr-x 1385 t7701-repack-unpack-unreachable.sh
-rwxr-xr-x 343 t8001-annotate.sh
-rwxr-xr-x 111 t8002-blame.sh
-rwxr-xr-x 2192 t8003-blame.sh
-rwxr-xr-x 1556 t8004-blame.sh
-rwxr-xr-x 8039 t9001-send-email.sh
-rwxr-xr-x 7708 t9100-git-svn-basic.sh
-rwxr-xr-x 5881 t9101-git-svn-props.sh
-rwxr-xr-x 789 t9102-git-svn-deep-rmdir.sh
-rwxr-xr-x 907 t9103-git-svn-tracked-directory-removed.sh
-rwxr-xr-x 6149 t9104-git-svn-follow-parent.sh
-rwxr-xr-x 1186 t9105-git-svn-commit-diff.sh
-rwxr-xr-x 2593 t9106-git-svn-commit-diff-clobber.sh
-rwxr-xr-x 1712 t9106-git-svn-dcommit-clobber-series.sh
-rwxr-xr-x 4503 t9107-git-svn-migrate.sh
-rwxr-xr-x 2944 t9108-git-svn-glob.sh
-rwxr-xr-x 1612 t9110-git-svn-use-svm-props.sh
drwxr-xr-x - t9110
-rwxr-xr-x 1600 t9111-git-svn-use-svnsync-props.sh
drwxr-xr-x - t9111
-rwxr-xr-x 922 t9112-git-svn-md5less-file.sh
-rwxr-xr-x 1056 t9113-git-svn-dcommit-new-file.sh
-rwxr-xr-x 2710 t9114-git-svn-dcommit-merge.sh
-rwxr-xr-x 2104 t9115-git-svn-dcommit-funky-renames.sh
drwxr-xr-x - t9115
-rwxr-xr-x 4027 t9116-git-svn-log.sh
-rwxr-xr-x 1188 t9117-git-svn-init-clone.sh
-rwxr-xr-x 1052 t9118-git-svn-funky-branch-names.sh
-rwxr-xr-x 11820 t9119-git-svn-info.sh
-rwxr-xr-x 683 t9120-git-svn-clone-with-percent-escapes.sh
-rwxr-xr-x 376 t9121-git-svn-fetch-renamed-dir.sh
drwxr-xr-x - t9121
-rwxr-xr-x 1897 t9122-git-svn-author.sh
-rwxr-xr-x 590 t9123-git-svn-rebuild-with-rewriteroot.sh
-rwxr-xr-x 9771 t9200-git-cvsexportcommit.sh
-rwxr-xr-x 20987 t9300-fast-import.sh
-rwxr-xr-x 3220 t9301-fast-export.sh
-rwxr-xr-x 13518 t9400-git-cvsserver-server.sh
-rwxr-xr-x 11780 t9401-git-cvsserver-crlf.sh
-rwxr-xr-x 17475 t9500-gitweb-standalone-no-errors.sh
-rwxr-xr-x 2430 t9600-cvsimport.sh
-rwxr-xr-x 1099 t9700-perl-git.sh
drwxr-xr-x - t9700
-rw-r--r-- 12100 test-lib.sh
-rw-r--r-- 5660 test4012.png
-rw-r--r-- 5660 test9200a.png
-rw-r--r-- 275 test9200b.png