diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-08-10 20:58:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-10 20:58:45 (GMT) |
| commit | 79f5e0645ac7239bb0b019f2595bca18d469a280 (patch) | |
| tree | bf18ff6012b4903dd4f3810d2af334acd7b7830f /unpack-trees.h | |
| parent | 22631473e0b7a33356587ba3e38a9b4cc4dba2f1 (diff) | |
| parent | 933bf40a5c6328b6c022b636f45a6f2c48c3838e (diff) | |
| download | git-79f5e0645ac7239bb0b019f2595bca18d469a280.zip git-79f5e0645ac7239bb0b019f2595bca18d469a280.tar.gz git-79f5e0645ac7239bb0b019f2595bca18d469a280.tar.bz2 | |
Merge branch 'lt/readtree'
* lt/readtree:
Start moving unpack-trees to "struct tree_desc"
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index fee7da4..9cd39a2 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -26,7 +26,7 @@ struct unpack_trees_options { struct cache_entry *df_conflict_entry; }; -extern int unpack_trees(struct object_list *trees, +extern int unpack_trees(unsigned n, struct tree_desc *t, struct unpack_trees_options *options); int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o); |