Elijah Newren <new...@gmail.com> writes: > What depends on stage#2 coming from the commit that will become the > first parent?
How about "git diff --cc" for a starter? What came from HEAD's ancestry should appear first and then what came from the side branch that is merged into.
