The current behavior of StGIT is to not use the index for conflicts like git does. What advantages does this have that are great enough to motivate a deviation from the git behavior? -- Karl Hasselström, kha@xxxxxxxxxxx www.treskal.com/kalle - 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