git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed

b527d145c74855126849a996986efe3d62856907 blob 402 bytes (raw)

#ifndef MERGE_STRATEGIES_H
#define MERGE_STRATEGIES_H

#include "object.h"

int merge_strategies_one_file(struct repository *r,
			      const struct object_id *orig_blob,
			      const struct object_id *our_blob,
			      const struct object_id *their_blob, const char *path,
			      unsigned int orig_mode, unsigned int our_mode,
			      unsigned int their_mode);

#endif /* MERGE_STRATEGIES_H */

debug log:

solving b527d145c7 ...
found b527d145c7 in https://public-inbox.org/git/20200625121953.16991-6-alban.gruin@gmail.com/ ||
	https://public-inbox.org/git/20200901105705.6059-3-alban.gruin@gmail.com/ ||
	https://public-inbox.org/git/20201005122646.27994-3-alban.gruin@gmail.com/

applying [1/3] https://public-inbox.org/git/20200625121953.16991-6-alban.gruin@gmail.com/
diff --git a/merge-strategies.h b/merge-strategies.h
new file mode 100644
index 0000000000..b527d145c7

Checking patch merge-strategies.h...
Applied patch merge-strategies.h cleanly.

skipping https://public-inbox.org/git/20200901105705.6059-3-alban.gruin@gmail.com/ for b527d145c7
skipping https://public-inbox.org/git/20201005122646.27994-3-alban.gruin@gmail.com/ for b527d145c7
index at:
100644 b527d145c74855126849a996986efe3d62856907	merge-strategies.h

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).