Merge Diff Extension

[Martin Geisler]

"Na'Tosha Bard" <natosha at gmail.com> writes:

> On Sun, Mar 11, 2012 at 8:40 PM, Matt Mackall <mpm at selenic.com> wrote:
>
>>
>>
>> I agree. The theory behind this extension is.. a little fuzzy but
>> basically ok. But I would frankly tweak the output to be less
>> diff-like (there's no chance in hell it'll ever work with patch) and
>> more user-friendly.
>
> I do agree the output in particular is a little wonky.  I'll try a few
> things and see what I can come up with and send some ideas and example
> output.

I can see that the output from mergediff "roughly emulates" the combined
diff format from Git:

  http://schacon.github.com/git/git-diff.html#_combined_diff_format

Maybe you could make it more (or exactly) like that output? I think it's
good to follow an already established format for this, unless there are
flaws in that output that you want to correct?

-- 
Martin Geisler

Mercurial links: http://mercurial.ch/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20120312/0115fbe3/attachment.asc>