merge-strategies.txt: fix typo

diff --git a/test-match-trees.c b/test-match-trees.c
index 2ef725e5ff94c4db59fdc4b389ee2399854cb83b..109f03e711803251b5b5d06bc42579784a326ba8 100644 (file)
--- a/test-match-trees.c
+++ b/test-match-trees.c
@@ -17,7 +17,7 @@ int main(int ac, char **av)
        if (!two)
                die("not a tree-ish %s", av[2]);
 
-       shift_tree(one->object.sha1, two->object.sha1, shifted, -1);
+       shift_tree(one->object.oid.hash, two->object.oid.hash, shifted, -1);
        printf("shifted: %s\n", sha1_to_hex(shifted));
 
        exit(0);