search

FredrikNoren / ungit

The easiest way to use git. On any platform. Anywhere.
MIT License
10.43k stars 636 forks source link

[Bug] Empty Merge screen after discarding changed file #1431

Open Sogolumbo opened 3 years ago

Sogolumbo commented 3 years ago

When merging with merge conflicts there's the option to discard any changes made to a file. After doing so ungit shows an empty screen.

Instead it should still show the buttons 'Merge' or 'abort'.