Bert Wesarg <bert.wesarg@xxxxxxxxxxxxxx> writes: > WIll do. On a side note: I plan to support the --union option also for > git-checkout. Would that be a good idea? What does it do? Resolve conflicted paths using union merge at checkout time? That somehow feels like a dirty "because we can, and I only care about union" hack to me. I am mildly against "merge-file --union" in the first place. The part I actually liked in [2/3] was the removal of postprocessing. -- 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