cherry-pick/revert: add scissors line on merge conflict

diff --git a/t/lib-pack.sh b/t/lib-pack.sh
index 4674899b30871f55894750b61b66020f0d16a646..c4d907a450a7863ff0fe32fe9aed7ef5c100dd3e 100644 (file)
--- a/t/lib-pack.sh
+++ b/t/lib-pack.sh
@@ -97,7 +97,7 @@ pack_obj () {
 
 # Compute and append pack trailer to "$1"
 pack_trailer () {
-       test-sha1 -b <"$1" >trailer.tmp &&
+       test-tool sha1 -b <"$1" >trailer.tmp &&
        cat trailer.tmp >>"$1" &&
        rm -f trailer.tmp
 }