merge: seed the commit message with list of conflicted files.
[git] / t /
drwxr-xr-x   ..
-rw-r--r-- 468 Makefile
-rw-r--r-- 6749 README
-rwxr-xr-x 1416 diff-lib.sh
-rwxr-xr-x 4211 lib-read-tree-m-3way.sh
-rwxr-xr-x 7739 t0000-basic.sh
-rwxr-xr-x 609 t0010-racy-git.sh
-rwxr-xr-x 16706 t1000-read-tree-m-3way.sh
-rwxr-xr-x 10449 t1001-read-tree-m-2way.sh
-rwxr-xr-x 9966 t1002-read-tree-m-u-2way.sh
-rwxr-xr-x 1104 t1100-commit-tree-options.sh
-rwxr-xr-x 4217 t1200-tutorial.sh
-rwxr-xr-x 5278 t1300-repo-config.sh
-rwxr-xr-x 1226 t2000-checkout-cache-clash.sh
-rwxr-xr-x 2487 t2001-checkout-cache-clash.sh
-rwxr-xr-x 740 t2002-checkout-cache-u.sh
-rwxr-xr-x 2579 t2003-checkout-cache-mkdir.sh
-rwxr-xr-x 1053 t2100-update-cache-badpath.sh
-rwxr-xr-x 1164 t3000-ls-files-others.sh
-rwxr-xr-x 1290 t3001-ls-files-others-exclude.sh
-rwxr-xr-x 1212 t3002-ls-files-dashpath.sh
-rwxr-xr-x 2090 t3010-ls-files-killed-modified.sh
-rwxr-xr-x 3694 t3100-ls-tree-restrict.sh
-rwxr-xr-x 3773 t3101-ls-tree-dirname.sh
-rwxr-xr-x 909 t3200-branch.sh
-rwxr-xr-x 4133 t3300-funny-names.sh
-rwxr-xr-x 902 t3400-rebase.sh
-rwxr-xr-x 1276 t3401-rebase-partial.sh
-rwxr-xr-x 1476 t3500-cherry.sh
-rwxr-xr-x 1057 t4000-diff-format.sh
-rwxr-xr-x 1040 t4001-diff-rename.sh
-rwxr-xr-x 14797 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 1006 t4006-diff-mode.sh
-rwxr-xr-x 2783 t4007-rename-3.sh
-rwxr-xr-x 6087 t4008-diff-break-rewrite.sh
-rwxr-xr-x 2910 t4009-diff-rename-4.sh
-rwxr-xr-x 1782 t4010-diff-pathspec.sh
-rwxr-xr-x 1713 t4011-diff-symlink.sh
-rwxr-xr-x 1218 t4100-apply-stat.sh
drwxr-xr-x - t4100
-rwxr-xr-x 647 t4101-apply-nonl.sh
-rwxr-xr-x 689 t4102-apply-rename.sh
-rwxr-xr-x 3033 t4103-apply-binary.sh
-rwxr-xr-x 2720 t4109-apply-multifrag.sh
-rwxr-xr-x 1361 t4110-apply-scan.sh
-rwxr-xr-x 3289 t4112-apply-renames.sh
-rwxr-xr-x 2610 t5000-tar-tree.sh
-rwxr-xr-x 4983 t5300-pack-object.sh
-rwxr-xr-x 1474 t5400-send-pack.sh
-rwxr-xr-x 2790 t5500-fetch-pack.sh
-rwxr-xr-x 938 t5501-old-fetch-and-upload.sh
-rwxr-xr-x 2538 t6000lib.sh
-rwxr-xr-x 10339 t6001-rev-list-merge-order.sh
-rwxr-xr-x 8366 t6002-rev-list-bisect.sh
-rwxr-xr-x 8715 t6003-rev-list-topo-order.sh
-rwxr-xr-x 1252 t6010-merge-base.sh
-rwxr-xr-x 528 t6020-merge-df.sh
-rwxr-xr-x 1230 t6021-merge-criss-cross.sh
-rwxr-xr-x 5167 t6022-merge-rename.sh
-rwxr-xr-x 1589 t6101-rev-parse-parents.sh
-rwxr-xr-x 615 t7001-mv.sh
-rwxr-xr-x 4193 test-lib.sh