summaryrefslogtreecommitdiff
path: root/ref-filter.h
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2016-06-24 23:09:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-28 18:39:02 (GMT)
commit4e8161a82e5449976392517968b2d1bb56109b29 (patch)
tree552b128d238cb8ac3176ba31792a32866c390364 /ref-filter.h
parentb4da9d62f91d66ab97815007105b42a2aa5846b5 (diff)
downloadgit-4e8161a82e5449976392517968b2d1bb56109b29.zip
git-4e8161a82e5449976392517968b2d1bb56109b29.tar.gz
git-4e8161a82e5449976392517968b2d1bb56109b29.tar.bz2
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 'ref-filter.h')
0 files changed, 0 insertions, 0 deletions