implement line/word diff

[samoht]

We don't currently merge two strings if both contents has been modified since the have branched from a common ancestor. To improve that, need to have a look at https://github.com/janestreet/patdiff but it seems to depend on https://github.com/janestreet/core_extended ... @diml any chance to have the patdiff library usable on mirage (ie. pure ocaml code) ?

[avsm]

Looks like https://github.com/janestreet/core_extended/blob/master/lib/patience_diff.ml is pretty standalone and doesn't really need the rest of Core_extended.

[ghost]

Yeah I think we can pull this file out of core_extended without problem. I'll look into it.

[ghost]

I haven't looked at the code in detail yet, but would patience_diff.ml be enough or are there things needed from patdiff/lib?

[samoht]

I think patience_diff.ml should be enough, though.

[samoht]

I've created https://github.com/samoht/ocaml-patience which depends only on core_kernel

[ghost]

OK, actually we'll do this too for the next release.

[ghost]

We created https://github.com/janestreet/patience_diff, shall it replace the patience package in opam?

[samoht]

Thanks! Yes, you can replace my temporary package, I'll update the Irminsule package.

[bmillwood]

patience_diff will be in opam as soon as https://github.com/ocaml/opam-repository/pull/2062 goes through.

[samoht]

See also https://github.com/gjaldon/simple-diff