Junio C Hamano <junkio@xxxxxxx> writes: > Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > >> On Tue, 5 Dec 2006, Linus Torvalds wrote: >> >>> - take every single merge in git (or the kernel, if you want even more) > > The attached is the script I am using. The test checks the > output from 'master' (merge from RCS) and 'next' (with xdl-merge) > and also tries to see how different the conflicts look like. > > In the git.git archive, there is no "clean" merge on which > 'master' and 'next' did not agree. It is not a proof of > correctness at all but it gives a sense of assurance. And all merges in linux-2.6.git archive either result in conflict with both 'merge' implementations, or cleanly resolves the same way with both 'merge' implementations. I have not compared the conflicted cases yet, but at least it gives me a warm fuzzy feeling to see that autocommitted stuff are sensible. - 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