Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
describe: Make --tags and --all match lightweight tags more often
[gitweb.git]
/
t
/
t1000-read-tree-m-3way.sh
diff --git
a/t/t1000-read-tree-m-3way.sh
b/t/t1000-read-tree-m-3way.sh
index 807fb83af8c65304f1dae2ee35ba0f2909ddf465..22ba7a5442c587f4536aad5668df43661231de56 100755
(executable)
--- a/
t/t1000-read-tree-m-3way.sh
+++ b/
t/t1000-read-tree-m-3way.sh
@@
-72,7
+72,7
@@
In addition:
'
. ./test-lib.sh
-.
..
/lib-read-tree-m-3way.sh
+.
"$TEST_DIRECTORY"
/lib-read-tree-m-3way.sh
################################################################
# Trivial "majority when 3 stages exist" merge plus #2ALT, #3ALT