Thomas Rast writes:
> + assemble_conflict_entry(&content,
> + branch1, branch2,
> + stage2, stage3);
> + if (write_sha1_file(content.buf, content.len,
> +
Thomas Rast writes:
Thomas Rast writes:
> Git has --cc as a very fast inspection tool that shows a brief summary
> of what a conflicted merge "looks like", and -c/-m as "give me the
> full information" data dumps.
>
> But --cc actually loses information: if the merge lost(!) some changes
> from
Thomas Rast writes:
> +static void assemble_conflict_entry(struct strbuf *sb,
> + const char *branch1,
> + const char *branch2,
> + struct cache_entry *entry1,
> + struc
3 matches
Mail list logo
