Hi,
On Thu, 13 Mar 2008, Clemens Buchacher wrote:
> @@ -1062,6 +1071,8 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
> } else {
> die("unsupported object type in the tree");
> }
> +
> + result.merge = !result.clean;
That is new. Doesn't this overwrite what has been set in
} else {
if (!sha_eq(a->sha1, o->sha1) && !sha_eq(b->sha1, o->sha1))
result.merge = 1;
?
Ciao,
Dscho
--
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
