diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2016-06-24 23:09:28 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-06-28 11:39:02 -0700 |
| commit | 4e8161a82e5449976392517968b2d1bb56109b29 (patch) | |
| tree | 552b128d238cb8ac3176ba31792a32866c390364 /builtin/merge-ours.c | |
| parent | merge-recursive: convert leaf functions to use struct object_id (diff) | |
| download | tgif-4e8161a82e5449976392517968b2d1bb56109b29.tar.xz | |
merge-recursive: convert merge_recursive_generic() to object_id
Convert this function and the git merge-recursive subcommand to use
struct object_id.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions