When might you be able to implement this? 3-way merges are doable, but I was hoping to be able to have my diff tool (Beyond Compare) be able to receive a 3-way diff from git without having to manually check out a copy or modify my repository's state. There are multiple Stack Overflow questions regarding this.
