Thomas Rast <t...@thomasrast.ch> writes:
> + assemble_conflict_entry(&content,
> + branch1, branch2,
> + stage2, stage3);
> + if (write_sha1_file(content.buf, content.len,
> + typename(OBJ_BLOB), sha1))
> + die("write_sha1_file failed");
> +...
> + if (cache_tree_update(&the_index, WRITE_TREE_SILENT) < 0) {
> + printf("BUG: merge conflicts not fully folded, cannot diff.\n");
> + return !opt->loginfo;
> + }
Another worry I have on this change is that it breaks the
expectation that "log [-p]" is a read-only operation. I do not know
how big a breakage this will be viewed as by those uninitiated who
do not know how --remerge-diff (or Git in general) works internally.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
