Elijah Newren <new...@gmail.com> writes: > Out of 53288 merge commits with exactly two parents in linux.git: > - 48491 merged identically > - 4737 merged the same other than a few different "Auto-merging > <filename>" output lines (as expected due to patch 35/36) > - 53 merged the same other than different "Checking out files: ..." > output (I just did a plain merge; no flags like --no-progress) > - the remaining 7 commits had non-trivial merge differences, all > attributable to directory rename detection kicking in > > So, it looks good to me. If anyone has suggestions for other testing > to do, let me know.
There must have been some merges that stopped due to conflicts among those 50k, and I am interested to hear how they were different. Or are they included in the above numbers (e.g. among 48491 there were ones that stopped with conflicts, but the results these conflictted merge left in the working tree and the index were identical)?
