Initially it was to allow specifying more than one remote to
allow creation of an Octopus, but it is not being used.
Signed-off-by: Junio C Hamano <junkio@cox.net>
- if (!strcmp(arg, "--head")) {
- head_idx = stage - 1;
- fn = threeway_merge;
- }
-
/* "-m" stands for "merge", meaning we start in stage 1 */
if (!strcmp(arg, "-m")) {
if (stage || merge)
/* "-m" stands for "merge", meaning we start in stage 1 */
if (!strcmp(arg, "-m")) {
if (stage || merge)
}
if ((update||index_only) && !merge)
usage(read_tree_usage);
}
if ((update||index_only) && !merge)
usage(read_tree_usage);
if (stage < 2)
die("just how do you expect me to merge %d trees?", stage-1);
switch (stage - 1) {
if (stage < 2)
die("just how do you expect me to merge %d trees?", stage-1);
switch (stage - 1) {
fn = threeway_merge;
break;
}
fn = threeway_merge;
break;
}
if (stage - 1 >= 3)
head_idx = stage - 2;
else
if (stage - 1 >= 3)
head_idx = stage - 2;
else