]>
Commit | Line | Data |
---|---|---|
17e5574b EN |
1 | /* |
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 | |
4 | * to replace | |
5 | * | |
6 | * git merge [-s recursive] | |
7 | * | |
8 | * with | |
9 | * | |
10 | * git merge -s ort | |
11 | * | |
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"?) | |
15 | */ | |
16 | ||
17 | #include "cache.h" | |
18 | #include "merge-ort.h" | |
19 | ||
20 | void merge_switch_to_result(struct merge_options *opt, | |
21 | struct tree *head, | |
22 | struct merge_result *result, | |
23 | int update_worktree_and_index, | |
24 | int display_update_msgs) | |
25 | { | |
26 | die("Not yet implemented"); | |
27 | merge_finalize(opt, result); | |
28 | } | |
29 | ||
30 | void merge_finalize(struct merge_options *opt, | |
31 | struct merge_result *result) | |
32 | { | |
33 | die("Not yet implemented"); | |
34 | } | |
35 | ||
36 | void merge_incore_nonrecursive(struct merge_options *opt, | |
37 | struct tree *merge_base, | |
38 | struct tree *side1, | |
39 | struct tree *side2, | |
40 | struct merge_result *result) | |
41 | { | |
42 | die("Not yet implemented"); | |
43 | } | |
44 | ||
45 | void merge_incore_recursive(struct merge_options *opt, | |
46 | struct commit_list *merge_bases, | |
47 | struct commit *side1, | |
48 | struct commit *side2, | |
49 | struct merge_result *result) | |
50 | { | |
51 | die("Not yet implemented"); | |
52 | } |