Re: [jgit-dev] "instable" diff algorithms lead to wrong merge results

[Christian Halstrick <christian.halstrick@xxxxxxxxx>]

Hi,

> Do you consider "lines of context" when you do this?

No, I don't. I think that is the reason why we merge differently in
JGit than in C Git. I'll add these checks to the merge algorithm and
see if we become more compatible for cases. That's my main goal - to
give the same results as C Git. I am glad we finally found a hint how
to solve this.

Ciao
  Chris