diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-06 22:10:36 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-08 15:12:58 +0900 |
| commit | 48be4c625bf0f35309fdf501f47eb7445a9f5494 (patch) | |
| tree | 57c025e707cefa3ae1afadf61dfb1df3d2cb11c4 /merge.c | |
| parent | 944cffbd18a7dbe0b4c5849da6f093c41b49ea00 (diff) | |
| download | git-48be4c625bf0f35309fdf501f47eb7445a9f5494.tar.gz | |
sequencer: convert do_recursive_merge to struct object_id
This conversion is required to convert parse_tree_indirect.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions