jsdiff icon indicating copy to clipboard operation
jsdiff copied to clipboard

Is there a way to generate a git-merge style single string?

Open hponde opened this issue 4 years ago • 1 comments

If I have a patch and the original content, is there a way using this library to generate the single string that we see as the output of a git merge with the <<<<<<, ====== and >>>>>> markers?

hponde avatar Dec 23 '20 19:12 hponde

Pretty sure the merge code in merge.js is meant to be able to support this, but there are open bug reports about it, it's not documented, and I'm not totally sure how it works. I'll get back to this question once I've addressed other issues about that code and had a proper look at it...

ExplodingCabbage avatar Jan 08 '24 17:01 ExplodingCabbage

No longer planned. Closing as a dupe of https://github.com/kpdecker/jsdiff/issues/181, but I personally am not gonna tackle that; sorry!

ExplodingCabbage avatar Jun 29 '24 19:06 ExplodingCabbage