Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:
> I wonder if we should also do
>
> diff --git a/builtin-rerere.c b/builtin-rerere.c
> index b8867ab..4eae27b 100644
> --- a/builtin-rerere.c
> +++ b/builtin-rerere.c
> @@ -112,7 +112,8 @@ static int handle_file(const char *path,
> else if (!prefixcmp(buf, ">>>>>>> ")) {
> hunk_no++;
> hunk = 0;
> - if (memcmp(one->ptr, two->ptr, one->nr < two->nr ?
> + if (one->nr > two->nr || memcmp(one->ptr, two->ptr,
> + one->nr < two->nr ?
> one->nr : two->nr) > 0) {
> struct buffer *swap = one;
> one = two;
>
> in case that one conflicting region is prefix of the other one.
If one is not a prefix of two but simply longer what does that
code do?
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html