0

conflict solver: show blame

Mario123 11 months ago updated 11 months ago 2

Using the Conflict solver I can browse to the base changes, but I don't see the commits affecting the changes in both trees. That would be a great benefit for solving conflicts.

Thus, adding the git blame window to the line with the change would be good, either as a single line below each file or as the standard blame window.

If possible show blame for both trees (right and left)

That would be an option. On the other hand just blaming both sides simultanously would also be great.