53 lines
1.3 KiB
C
53 lines
1.3 KiB
C
|
/*
|
||
|
|
* "Ostensibly Recursive's Twin" merge strategy, or "ort" for short. Meant
|
||
|
|
* as a drop-in replacement for the "recursive" merge strategy, allowing one
|
||
|
|
* to replace
|
||
|
|
*
|
||
|
|
* git merge [-s recursive]
|
||
|
|
*
|
||
|
|
* with
|
||
|
|
*
|
||
|
|
* git merge -s ort
|
||
|
|
*
|
||
|
|
* Note: git's parser allows the space between '-s' and its argument to be
|
||
|
|
* missing. (Should I have backronymed "ham", "alsa", "kip", "nap, "alvo",
|
||
|
|
* "cale", "peedy", or "ins" instead of "ort"?)
|
||
|
|
*/
|
||
|
|
|
||
|
|
#include "cache.h"
|
||
|
|
#include "merge-ort.h"
|
||
|
|
|
||
|
|
void merge_switch_to_result(struct merge_options *opt,
|
||
|
|
struct tree *head,
|
||
|
|
struct merge_result *result,
|
||
|
|
int update_worktree_and_index,
|
||
|
|
int display_update_msgs)
|
||
|
|
{
|
||
|
|
die("Not yet implemented");
|
||
|
|
merge_finalize(opt, result);
|
||
|
|
}
|
||
|
|
|
||
|
|
void merge_finalize(struct merge_options *opt,
|
||
|
|
struct merge_result *result)
|
||
|
|
{
|
||
|
|
die("Not yet implemented");
|
||
|
|
}
|
||
|
|
|
||
|
|
void merge_incore_nonrecursive(struct merge_options *opt,
|
||
|
|
struct tree *merge_base,
|
||
|
|
struct tree *side1,
|
||
|
|
struct tree *side2,
|
||
|
|
struct merge_result *result)
|
||
|
|
{
|
||
|
|
die("Not yet implemented");
|
||
|
|
}
|
||
|
|
|
||
|
|
void merge_incore_recursive(struct merge_options *opt,
|
||
|
|
struct commit_list *merge_bases,
|
||
|
|
struct commit *side1,
|
||
|
|
struct commit *side2,
|
||
|
|
struct merge_result *result)
|
||
|
|
{
|
||
|
|
die("Not yet implemented");
|
||
|
|
}
|