dmusican / Elegit

A GUI client for people who want to learn Git.
MIT License
30 stars 7 forks source link

Show deleted lines in conflictResolution #632

Open mgorra opened 6 years ago

mgorra commented 6 years ago

Currently lines that were deleted on one side of the merge are shown as additions on the other side. This could be misleading, since users may think those lines are new code rather than old. This would be tricky to fix, as git diff notes them as additions, and you might need to check a mutual parent to figure it out.