Please sign in to comment.
Removed grabbing upstream infos from the left and right conflicts
This was a really good idea but it makes for unpredictable file names when the conflicts stem from a rebase, cherry-pick, or unstash. I wish there was a way to express this very useful data elsewhere, but for now I'm going to pull it out.
- Loading branch information...