0

GNU diff3 allows git-style potentially conflicting file merges

Busybox does not support diff3, but instead supports diff and patch

Is it possible to emulate diff3 result somehow?

Context: I am looking to do simplistic (conflicted) file merges with busybox to compile it later with Emscripten and put on the Web to do a LaTeX editor in a browser. I do have some feasible workarounds (like compiling programs separately and shipping multiple Emscripten modules), but doing it with Busybox would simplify things.

Thanks!

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service, privacy policy and cookie policy

Browse other questions tagged or ask your own question.