2 * "Ostensibly Recursive's Twin" merge strategy, or "ort" for short. Meant
3 * as a drop-in replacement for the "recursive" merge strategy, allowing one
6 * git merge [-s recursive]
12 * Note: git's parser allows the space between '-s' and its argument to be
13 * missing. (Should I have backronymed "ham", "alsa", "kip", "nap, "alvo",
14 * "cale", "peedy", or "ins" instead of "ort"?)
18 #include "merge-ort.h"
20 void merge_switch_to_result(struct merge_options *opt,
22 struct merge_result *result,
23 int update_worktree_and_index,
24 int display_update_msgs)
26 die("Not yet implemented");
27 merge_finalize(opt, result);
30 void merge_finalize(struct merge_options *opt,
31 struct merge_result *result)
33 die("Not yet implemented");
36 void merge_incore_nonrecursive(struct merge_options *opt,
37 struct tree *merge_base,
40 struct merge_result *result)
42 die("Not yet implemented");
45 void merge_incore_recursive(struct merge_options *opt,
46 struct commit_list *merge_bases,
49 struct merge_result *result)
51 die("Not yet implemented");