Skip to main content

Browse the archive

https://github.com/git/git
05 April 2024, 19:32:26 UTC
Revision c8af1f475afb01b555abe5087b6b2f46b2d00b55 authored by Junio C Hamano on 06 February 2021, 00:31:25 UTC, committed by Junio C Hamano on 06 February 2021, 00:31:25 UTC 
Merge branch 'vv/send-email-with-less-secure-apps-access' into maint
 
Doc update.

* vv/send-email-with-less-secure-apps-access:
  git-send-email.txt: mention less secure app access with Gmail
2 parent s 64971f0 + 155067a
Raw File
Tip revision: c8af1f475afb01b555abe5087b6b2f46b2d00b55 authored by Junio C Hamano on 06 February 2021, 00:31:25 UTC
Merge branch 'vv/send-email-with-less-secure-apps-access' into maint
Tip revision: c8af1f4
merge-ort-wrappers.h 
#ifndef MERGE_ORT_WRAPPERS_H
#define MERGE_ORT_WRAPPERS_H

#include "merge-recursive.h"

/*
 * rename-detecting three-way merge, no recursion.
 * Wrapper mimicking the old merge_trees() function.
 */
int merge_ort_nonrecursive(struct merge_options *opt,
			   struct tree *head,
			   struct tree *merge,
			   struct tree *common);

/*
 * rename-detecting three-way merge with recursive ancestor consolidation.
 * Wrapper mimicking the old merge_recursive() function.
 */
int merge_ort_recursive(struct merge_options *opt,
			struct commit *h1,
			struct commit *h2,
			struct commit_list *ancestors,
			struct commit **result);

#endif
back to top