Hi, On Fri, 29 Jun 2007, Johannes Sixt wrote: > However, if only two stages are present, the file mode is still taken > from the file instead of from the index. As that easy to solve (at least > for the unambiguous case)? It might be related to the bug Junio found, i.e. that I assumed stage 1 to be "ours". Ciao, Dscho - 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
