Use Daniel's read-tree in the merge strategy 'resolve'.
[git] / t /
drwxr-xr-x   ..
-rw-r--r-- 243 Makefile
-rw-r--r-- 6749 README
-rwxr-xr-x 1336 diff-lib.sh
-rwxr-xr-x 4211 lib-read-tree-m-3way.sh
-rwxr-xr-x 7067 t0000-basic.sh
-rwxr-xr-x 17979 t1000-read-tree-m-3way.sh
-rwxr-xr-x 10448 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 1226 t2000-checkout-cache-clash.sh
-rwxr-xr-x 2485 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 640 t3000-ls-files-others.sh
-rwxr-xr-x 953 t3001-ls-files-others-exclude.sh
-rwxr-xr-x 1284 t3010-ls-files-killed.sh
-rwxr-xr-x 2945 t3100-ls-tree-restrict.sh
-rwxr-xr-x 659 t3200-branch.sh
-rwxr-xr-x 1099 t4000-diff-format.sh
-rwxr-xr-x 1038 t4001-diff-rename.sh
-rwxr-xr-x 14797 t4002-diff-basic.sh
-rwxr-xr-x 4122 t4003-diff-rename-1.sh
-rwxr-xr-x 1542 t4004-diff-rename-symlink.sh
-rwxr-xr-x 5453 t4005-diff-rename-2.sh
-rwxr-xr-x 684 t4006-diff-mode.sh
-rwxr-xr-x 2783 t4007-rename-3.sh
-rwxr-xr-x 6087 t4008-diff-break-rewrite.sh
-rwxr-xr-x 5477 t4009-diff-rename-4.sh
-rwxr-xr-x 1782 t4010-diff-pathspec.sh
-rwxr-xr-x 1218 t4100-apply-stat.sh
drwxr-xr-x - t4100
-rwxr-xr-x 647 t4101-apply-nonl.sh
-rwxr-xr-x 575 t4102-apply-rename.sh
-rw-r--r-- 2720 t4109-apply-multifrag.sh
-rw-r--r-- 1361 t4110-apply-scan.sh
-rwxr-xr-x 3289 t4112-apply-renames.sh
-rwxr-xr-x 2559 t5000-tar-tree.sh
-rwxr-xr-x 4036 t5300-pack-object.sh
-rwxr-xr-x 1215 t5400-send-pack.sh
-rwxr-xr-x 2538 t6000lib.sh
-rwxr-xr-x 10318 t6001-rev-list-merge-order.sh
-rwxr-xr-x 8327 t6002-rev-list-bisect.sh
-rwxr-xr-x 8695 t6003-rev-list-topo-order.sh
-rw-r--r-- 1555 t6101-rev-parse-parents.sh
-rwxr-xr-x 3297 test-lib.sh