2009/2/4 Thomas Rast <trast@xxxxxxxxxxxxxxx>: [...] > > Here's a sequence of commands that makes a test case: > > git init > seq 1 10 > A > git add A > git commit -m initial > seq 11 15 >> A > git commit -m second A > seq 16 20 >> A > git commit -m third > git checkout -b side HEAD~2 > cp A B > git add B > git commit -m copy > seq 3 10 > B # <-- > git commit -m edit B > git rm A > git commit -m delete > > Then running > > git merge master > > goes through cleanly, but changing the line indicated above to 'seq 5 > 10' makes it less similar, falling through the detection and causing a > conflict. Thanks, but that's known, this is why I wrote "or the files are small". I was not clear, but what I wanted was a *real* test case. In which cases this is a problem in practice. > The minimum required similarity for merges does not seem to > be configurable unfortunately. No, but nevertheless it works fine most of the time, except with small files. HTH, Santi -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
