Am 7/11/2011 9:04, schrieb Johannes Sixt: > A heads-up: This test case fails here on Windows. The messages produced are: > As you can see, "Removing letters..." is missing on Windows, and the file > 'letters' is indeed left in the working tree. Any quick ideas where to > begin debugging this? And the reason for this is that the qsort call in record_df_conflict_files assumes that qsort is a stable sort; but this is not guaranteed. In particular, the entry "letters" can be moved after "letters/file", which is not expected by the loop that follows the qsort. -- Hannes -- 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