In what way is it different from wdiff? I can't see how you can take two files, get the diff, and then apply it to get a third file. You need to start with three files ("base", "branch 1", and "branch 2") to get a fourth ("combined"). What you do is take the diff of branch 1 with base, and apply that diff to branch 2. It's not quite so easy because you'll have to deal with non-obvious matches:

• Both branches removed the same line. Trivial - keep it removed.
• Both branches change the same line. If the result is the same, then we're ok, but if they're different, there's no way to tell which one is right.
• Both branches add a line to the same location - which one goes first often doesn't matter, but often it does.

I'd look at Algorithm::Diff::Apply to see if that would help.

---

---

Posts are HTML formatted. Put <p> </p> tags around your paragraphs. Put <code> </code> tags around your code and data!

Titles consisting of a single word are discouraged, and in most cases are disallowed outright.

Read Where should I post X? if you're not absolutely sure you're posting in the right place.

Please read these before you post! —

• How do I compose an effective node title?
• How do I post a question effectively?
• Markup in the Monastery

Posts may use any of the Perl Monks Approved HTML tags:

a, abbr, b, big, blockquote, br, caption, center, col, colgroup, dd, del, details, div, dl, dt, em, font, h1, h2, h3, h4, h5, h6, hr, i, ins, li, ol, p, pre, readmore, small, span, spoiler, strike, strong, sub, summary, sup, table, tbody, td, tfoot, th, thead, tr, tt, u, ul, wbr

You may need to use entities for some characters, as follows. (Exception: Within code tags, you can put the characters literally.)

	For:		Use:
	&		&
	<		&lt;
	>		&gt;
	[		&#91;
	]		&#93;

Link using PerlMonks shortcuts! What shortcuts can I use for linking?

See Writeup Formatting Tips and other pages linked from there for more info.