9c93ba4d0a
The documentation claims that "recursive defaults to the diff.algorithm config setting", but this is currently not the case. This fixes it, ensuring that diff.algorithm is used when -Xdiff-algorithm is not supplied. This affects the following porcelain commands: "merge", "rebase", "cherry-pick", "pull", "stash", "log", "am" and "checkout". It also affects the "merge-tree" ancillary interrogator. This change refactors the initialization of merge options to introduce two functions, "init_merge_ui_options" and "init_merge_basic_options" instead of just one "init_merge_options". This design follows the approach used in diff.c, providing initialization methods for porcelain and plumbing commands respectively. Thanks to that, the "replay" and "merge-recursive" plumbing commands remain unaffected by diff.algorithm. Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
18 lines
218 B
C
18 lines
218 B
C
int g(size_t u)
|
|
{
|
|
while (u < 30)
|
|
{
|
|
u++;
|
|
}
|
|
return u;
|
|
}
|
|
|
|
int h(int x, int y, int z)
|
|
{
|
|
if (z == 0)
|
|
{
|
|
return x;
|
|
}
|
|
return y;
|
|
}
|